diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 378db4084099..6b9f68028d33 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	mail
-PORTVERSION=	5.7.15
+PORTVERSION=	5.8.0
 DISTVERSIONPREFIX=	v
 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=	32
 
 USES=		cpe gettext nextcloud php:flavors
 USE_PHP=	imap
 
 CPE_VENDOR=	nextcloud
 
 # Precompiled linux binary is removed by post-patch but path still exist for future manual use
 PLIST_DIRS+=   %%WWWDIR%%/vendor/nextcloud/kitinerary-bin/bin
 
 post-patch:
 	${RM} ${WRKSRC}/vendor/nextcloud/kitinerary-bin/bin/kitinerary-extractor
 
 .include <bsd.port.mk>
diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index fb0d1179e2b8..6462684e20b2 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1778583282
-SHA256 (nextcloud/mail-v5.7.15.tar.gz) = cd3b7180989130d5b3c68e4e035c73b5d3c4f3279d3abdd11fce64997d445e0d
-SIZE (nextcloud/mail-v5.7.15.tar.gz) = 32090334
+TIMESTAMP = 1779264142
+SHA256 (nextcloud/mail-v5.8.0.tar.gz) = eab23c4c80b6d2c66920968c2a1c6ea4b4d7b46b75d820e70cd42f8adba7b90b
+SIZE (nextcloud/mail-v5.8.0.tar.gz) = 29812687