diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 91663ae0fe94..190d7be05c69 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,50 +1,51 @@
-PORTNAME=	mattermost-server
-PORTVERSION=	7.10.1
+PORTNAME=	mattermost
+PORTVERSION=	7.10.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
-MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
+MASTER_SITES=	https://raw.githubusercontent.com/${PORTNAME}/${PORTNAME}/${DISTVERSIONFULL}/:gomod
+PKGNAMESUFFIX=	-server
 DISTFILES=	go.mod:gomod
 
 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:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	mattermost
 USE_RC_SUBR=	mattermostd
 
-GO_MODULE=	github.com/mattermost/mattermost-server
+GO_MODULE=	github.com/mattermost/mattermost-server/v6
 GO_TARGET=	./cmd/mattermost ./scripts/config_generator
 GO_BUILDFLAGS=	-ldflags="-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=${PORTVERSION}"
 
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 post-extract:
 	@${RM} ${WRKSRC}/vendor/modules.txt
 
 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 814965eb780a..18816f3ebfa3 100644
--- a/www/mattermost-server/distinfo
+++ b/www/mattermost-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1684341549
-SHA256 (go/www_mattermost-server/mattermost-mattermost-server-v7.10.1_GH0/go.mod) = f932766b213123ac23f929b1daf15ff48b05178b447a1430ec89aab819aebc08
-SIZE (go/www_mattermost-server/mattermost-mattermost-server-v7.10.1_GH0/go.mod) = 9742
-SHA256 (go/www_mattermost-server/mattermost-mattermost-server-v7.10.1_GH0/mattermost-mattermost-server-v7.10.1_GH0.tar.gz) = 7d8dcd5f0b3981ac5b9b9520e2feae2a48b7f711b945ae7d38eac0909c461e38
-SIZE (go/www_mattermost-server/mattermost-mattermost-server-v7.10.1_GH0/mattermost-mattermost-server-v7.10.1_GH0.tar.gz) = 13587251
+TIMESTAMP = 1685715026
+SHA256 (go/www_mattermost-server/mattermost-mattermost-v7.10.2_GH0/go.mod) = f932766b213123ac23f929b1daf15ff48b05178b447a1430ec89aab819aebc08
+SIZE (go/www_mattermost-server/mattermost-mattermost-v7.10.2_GH0/go.mod) = 9742
+SHA256 (go/www_mattermost-server/mattermost-mattermost-v7.10.2_GH0/mattermost-mattermost-v7.10.2_GH0.tar.gz) = 40b0b6db7bee747192a101ae6fbd4d7d13be8d13ffb3e38e61ab03eac446775e
+SIZE (go/www_mattermost-server/mattermost-mattermost-v7.10.2_GH0/mattermost-mattermost-v7.10.2_GH0.tar.gz) = 13587040
diff --git a/www/mattermost-webapp/Makefile b/www/mattermost-webapp/Makefile
index 5a2bc4837062..934669e5e85b 100644
--- a/www/mattermost-webapp/Makefile
+++ b/www/mattermost-webapp/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	mattermost-webapp
-PORTVERSION=	7.10.1
+PORTVERSION=	7.10.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	https://releases.mattermost.com/${PORTVERSION}/
 DISTNAME=	mattermost-${PORTVERSION}-linux-amd64
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Webapp of Mattermost server
 WWW=		https://mattermost.org/
 
 LICENSE=	APACHE20
 
 WWWDIR=		${PREFIX}/www/mattermost
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 PLIST_SUB=	MATTERMOSTD_USER=${MATTERMOSTD_USER} \
 			MATTERMOSTD_GROUP=${MATTERMOSTD_GROUP}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKDIR}/mattermost && ${COPYTREE_SHARE} client ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/plugins
 
 .include <bsd.port.mk>
diff --git a/www/mattermost-webapp/distinfo b/www/mattermost-webapp/distinfo
index fee16e433748..49cfdcd4458c 100644
--- a/www/mattermost-webapp/distinfo
+++ b/www/mattermost-webapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684341180
-SHA256 (mattermost-7.10.1-linux-amd64.tar.gz) = ccbc367ccf0108118febf6c9dc1be22773b96a487bb7ca8de6c829fa12eb8f66
-SIZE (mattermost-7.10.1-linux-amd64.tar.gz) = 427185581
+TIMESTAMP = 1685710029
+SHA256 (mattermost-7.10.2-linux-amd64.tar.gz) = 4f697283806d02bc7cd77924e9e750ec05f766603b713b2b26e5acee4e9660f5
+SIZE (mattermost-7.10.2-linux-amd64.tar.gz) = 430402542