diff --git a/www/nextcloud-groupfolders/Makefile b/www/nextcloud-groupfolders/Makefile
index 3b3bb974871d..992fc9ad9d4b 100644
--- a/www/nextcloud-groupfolders/Makefile
+++ b/www/nextcloud-groupfolders/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	groupfolders
-PORTVERSION=	12.0.1
+PORTVERSION=	12.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
+MASTER_SITES=	https://github.com/nextcloud/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMEPREFIX=	nextcloud-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
-DIST_SUBDIR=	nextcloud
+DISTNAME=	${PORTNAME}
+DIST_SUBDIR=	nextcloud/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Groupfolders app for Nextcloud
 WWW=		https://apps.nextcloud.com/apps/groupfolders
 
 LICENSE=	AGPLv3
 
 RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=24:www/nextcloud@${PHP_FLAVOR}
 
 USES=		php:flavors
 IGNORE_WITH_PHP=	82
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 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-groupfolders/distinfo b/www/nextcloud-groupfolders/distinfo
index eef278a82ff4..55f9a9740677 100644
--- a/www/nextcloud-groupfolders/distinfo
+++ b/www/nextcloud-groupfolders/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656152417
-SHA256 (nextcloud/groupfolders-v12.0.1.tar.gz) = 903b9742232b4e6f64b8041ddcf3a44ba1bf9c4c8b10f764931a500c08f68a01
-SIZE (nextcloud/groupfolders-v12.0.1.tar.gz) = 2449313
+TIMESTAMP = 1665309368
+SHA256 (nextcloud/groupfolders-12.0.2/groupfolders.tar.gz) = 44792fa40587e076ca6cce19a14cb51c2cf2755770d9261026fcced36b191154
+SIZE (nextcloud/groupfolders-12.0.2/groupfolders.tar.gz) = 2419496