diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
index 07bcdf513625..d070f0bf3a5a 100644
--- a/www/nextcloud-contacts/Makefile
+++ b/www/nextcloud-contacts/Makefile
@@ -1,34 +1,35 @@
 # Created by: Bernard Spil <brnrd@freebsd.org>
 
 PORTNAME=	contacts
-DISTVERSION=	4.0.6
+DISTVERSION=	4.0.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 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
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Contacts app for Nextcloud
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR}
 
 USES=		cpe php:flavors
 CPE_VENDOR=	nextcloud
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 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/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo
index bfef93e46cba..ccf83e883582 100644
--- a/www/nextcloud-contacts/distinfo
+++ b/www/nextcloud-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636022603
-SHA256 (nextcloud/contacts-4.0.6/contacts.tar.gz) = 22606913d18ff41603d9ef055667c4a8f7bf1e7541052f43ec4803012d8dd9f7
-SIZE (nextcloud/contacts-4.0.6/contacts.tar.gz) = 4216469
+TIMESTAMP = 1639730603
+SHA256 (nextcloud/contacts-v4.0.7.tar.gz) = e3518ea6030912f3e4760119fd5c9b2f700290bae21442868d7bf50a83608140
+SIZE (nextcloud/contacts-v4.0.7.tar.gz) = 4235504