diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index be6cba74bf1d..4917263e6499 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	mail
-PORTVERSION=	4.0.3
+PORTVERSION=	4.0.6
 DISTVERSIONPREFIX=	v
+DISTNAME=	mail-stable4.0
 CATEGORIES=	mail
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Mail app for Nextcloud
 WWW=		https://apps.nextcloud.com/apps/mail
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NEXTCLOUD_RUN_DEPENDS=	30
 
 USES=		cpe gettext nextcloud php:flavors
 USE_PHP=	imap
 
 CPE_VENDOR=	nextcloud
 
 .include <bsd.port.mk>
diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index adee452d130b..4c818b2cda3a 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732360478
-SHA256 (nextcloud/mail-v4.0.3.tar.gz) = 4222454d8418520090551fa58e4ce673f6edff614120091a62f28647ce2aa545
-SIZE (nextcloud/mail-v4.0.3.tar.gz) = 25835833
+TIMESTAMP = 1732970644
+SHA256 (nextcloud/mail-stable4.0.tar.gz) = 6a8802d0e69284c2a2417ea7279fe2f7439986d9bafc149ef4aadc52a67a7617
+SIZE (nextcloud/mail-stable4.0.tar.gz) = 25562169