diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 292e7faf0b77..959456de038f 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -1,43 +1,44 @@
 # Created by: Bernard Spil <brnrd@freebsd.org>
 
 PORTNAME=	mail
-DISTVERSION=	1.11.1
+DISTVERSION=	1.11.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMEPREFIX=	nextcloud-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
-DISTNAME=	${PORTNAME}
-DIST_SUBDIR=	nextcloud/${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	nextcloud
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Mail app for Nextcloud
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR}
 
 USES=		cpe gettext php:flavors
 USE_PHP=	imap
 
 CPE_VENDOR=	nextcloud
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 NEXTCLOUD_USERNAME?=	${WWWOWN}
 NEXTCLOUD_GROUPNAME?=	${WWWGRP}
 
 PLIST_SUB=	NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \
 		NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME}
 
 WWWDIR=		${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	(cd ${WRKSRC}; ${FIND} . -not -type d) | ${SORT} | \
 		${SED} -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index 2e0325ebfcce..a371e9c9e608 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639123742
-SHA256 (nextcloud/mail-1.11.1/mail.tar.gz) = 773fab298468bfe304609d6d5304d8ca3f5cb7596898ada62e0e2a0057b5dfff
-SIZE (nextcloud/mail-1.11.1/mail.tar.gz) = 17412351
+TIMESTAMP = 1639658515
+SHA256 (nextcloud/mail-v1.11.4.tar.gz) = 9406ffae6a74057da42701b391bf8b8a1d024aa5a51107895c812dc177a027a4
+SIZE (nextcloud/mail-v1.11.4.tar.gz) = 17985832