diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 203bc575ae7a..6d361986c695 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,49 +1,48 @@
 PORTNAME=	mattermost
-PORTVERSION=	9.5.3
-PORTREVISION=	1
+PORTVERSION=	9.5.5
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/decke
 PKGNAMESUFFIX=	-server
 
 # implicit-approval+ for decke
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open source Slack-alternative in Golang and React
 WWW=		https://mattermost.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp
 
 USES=		go:1.22,modules tar:xz
 USE_RC_SUBR=	mattermostd
 
 GO_TARGET=	./cmd/mattermost ./scripts/config_generator
 GO_BUILDFLAGS=	-ldflags=" \
 		-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${PORTVERSION} \
 		-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none \
 		-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false"
 
 WRKSRC_SUBDIR=	server
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
 	${SETENV} OUTPUT_CONFIG=${WRKSRC}/config/default.json ${WRKDIR}/bin/config_generator
 	${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
 	${RM} ${STAGEDIR}${PREFIX}/bin/config_generator
 	${MKDIR} ${STAGEDIR}${WWWDIR}/templates
 	cd ${GO_WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n' ${STAGEDIR}${WWWDIR}
 	cd ${GO_WRKSRC}/templates && ${CP} *.html *.js ${STAGEDIR}${WWWDIR}/templates
 
 .include <bsd.port.mk>
diff --git a/www/mattermost-server/distinfo b/www/mattermost-server/distinfo
index 64170397f096..2de162a3e8fb 100644
--- a/www/mattermost-server/distinfo
+++ b/www/mattermost-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713956394
-SHA256 (mattermost-9.5.3.tar.xz) = b9a1e1a86d3b91c32914c1489bc90a3c7d7bd3e70eddc06e1af59a8a3b39a164
-SIZE (mattermost-9.5.3.tar.xz) = 102302152
+TIMESTAMP = 1716146796
+SHA256 (mattermost-9.5.5.tar.xz) = 91f84ee17f840c3a6d4742afa58f16b61dca49df3329d7dbbb764ad449d946fd
+SIZE (mattermost-9.5.5.tar.xz) = 104038592