diff --git a/www/nextcloud-forms/Makefile b/www/nextcloud-forms/Makefile
index aaa74a405787..5767c4a9a353 100644
--- a/www/nextcloud-forms/Makefile
+++ b/www/nextcloud-forms/Makefile
@@ -1,33 +1,33 @@
 # Created by: Bernard Spil <brnrd@freebsd.org>
 
 PORTNAME=	forms
-PORTVERSION=	2.3.0
+PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/nextcloud/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
+MASTER_SITES=	https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
 PKGNAMEPREFIX=	nextcloud-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
-DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	nextcloud/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Forms app for Nextcloud
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR}
 
 USES=		php:flavors
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR=		${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME}
+WRKSRC=		${WRKDIR}/${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-forms/distinfo b/www/nextcloud-forms/distinfo
index c5d4432269b7..1758d93bd659 100644
--- a/www/nextcloud-forms/distinfo
+++ b/www/nextcloud-forms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627501324
-SHA256 (nextcloud/forms-2.3.0/forms.tar.gz) = 626309f7fdd84f23867a5cd3f9cb4c25f47926b4cc97bc82f5584b68d7f2b495
-SIZE (nextcloud/forms-2.3.0/forms.tar.gz) = 3572043
+TIMESTAMP = 1637410178
+SHA256 (nextcloud/forms-2.4.0/forms-v2.4.0.tar.gz) = a5ef8de4f42de7cc8fe4a0ffd6a37efdbb131a75fe67072497added613d0dc01
+SIZE (nextcloud/forms-2.4.0/forms-v2.4.0.tar.gz) = 4416527