diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 1a1d3d916b18..a235dc3bc2f1 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	mail
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMEPREFIX=	nextcloud-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DIST_SUBDIR=	nextcloud
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Mail app for Nextcloud
 WWW=		https://apps.nextcloud.com/apps/mail
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=25:www/nextcloud@${PHP_FLAVOR}
 
 USES=		cpe gettext php:flavors
 USE_PHP=	imap
 IGNORE_WITH_PHP=	82
 
 CPE_VENDOR=	nextcloud
 
 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/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index 5171a8e961a7..f245e0f0c49a 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669379789
-SHA256 (nextcloud/mail-v2.1.2.tar.gz) = 1cd6bfc7c56a7bc0c4e1b602505473ef1ec2c1efdca348e4807bf68b8f210515
-SIZE (nextcloud/mail-v2.1.2.tar.gz) = 21810566
+TIMESTAMP = 1670579356
+SHA256 (nextcloud/mail-v2.2.1.tar.gz) = dc53362a4c44217b7d290e6503de970794598cfcdde670ad81e24083d6dd50b9
+SIZE (nextcloud/mail-v2.2.1.tar.gz) = 22144363