diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 3bcecfec7ed7..990fc1ad6542 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	mattermost
 PORTVERSION=	9.11.4
+PORTREVISION=	1
 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_TARGET=	./cmd/mattermost ./cmd/mmctl ./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/files/patch-cmd_mmctl_commands_utils__unix.go b/www/mattermost-server/files/patch-cmd_mmctl_commands_utils__unix.go
new file mode 100644
index 000000000000..b7a918c7f9d3
--- /dev/null
+++ b/www/mattermost-server/files/patch-cmd_mmctl_commands_utils__unix.go
@@ -0,0 +1,13 @@
+--- cmd/mmctl/commands/utils_unix.go.orig	2024-10-24 13:08:53 UTC
++++ cmd/mmctl/commands/utils_unix.go
+@@ -1,8 +1,8 @@
+ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+ // See LICENSE.txt for license information.
+ 
+-//go:build linux || darwin
+-// +build linux darwin
++//go:build linux || darwin || freebsd
++// +build linux darwin freebsd
+ 
+ package commands
+ 
diff --git a/www/mattermost-server/pkg-plist b/www/mattermost-server/pkg-plist
index c6f76b2ba119..1416a0da7a29 100644
--- a/www/mattermost-server/pkg-plist
+++ b/www/mattermost-server/pkg-plist
@@ -1,89 +1,90 @@
 bin/mattermostd
+bin/mmctl
 %%ETCDIR%%/config.json.sample
 %%WWWDIR%%/fonts/OFL.txt
 %%WWWDIR%%/fonts/nunito-bold.ttf
 %%WWWDIR%%/i18n/am.json
 %%WWWDIR%%/i18n/be.json
 %%WWWDIR%%/i18n/bg.json
 %%WWWDIR%%/i18n/br.json
 %%WWWDIR%%/i18n/ca.json
 %%WWWDIR%%/i18n/cs.json
 %%WWWDIR%%/i18n/da.json
 %%WWWDIR%%/i18n/de.json
 %%WWWDIR%%/i18n/el.json
 %%WWWDIR%%/i18n/en-AU.json
 %%WWWDIR%%/i18n/en.json
 %%WWWDIR%%/i18n/es.json
 %%WWWDIR%%/i18n/et.json
 %%WWWDIR%%/i18n/eu.json
 %%WWWDIR%%/i18n/fa.json
 %%WWWDIR%%/i18n/fi.json
 %%WWWDIR%%/i18n/fr.json
 %%WWWDIR%%/i18n/gl.json
 %%WWWDIR%%/i18n/gu.json
 %%WWWDIR%%/i18n/he.json
 %%WWWDIR%%/i18n/hi.json
 %%WWWDIR%%/i18n/hr.json
 %%WWWDIR%%/i18n/hu.json
 %%WWWDIR%%/i18n/id.json
 %%WWWDIR%%/i18n/it.json
 %%WWWDIR%%/i18n/ja.json
 %%WWWDIR%%/i18n/ka.json
 %%WWWDIR%%/i18n/km.json
 %%WWWDIR%%/i18n/ko.json
 %%WWWDIR%%/i18n/lo.json
 %%WWWDIR%%/i18n/lt.json
 %%WWWDIR%%/i18n/mk.json
 %%WWWDIR%%/i18n/ml.json
 %%WWWDIR%%/i18n/mn.json
 %%WWWDIR%%/i18n/nb-NO.json
 %%WWWDIR%%/i18n/ne.json
 %%WWWDIR%%/i18n/nl.json
 %%WWWDIR%%/i18n/pl.json
 %%WWWDIR%%/i18n/pt-BR.json
 %%WWWDIR%%/i18n/pt.json
 %%WWWDIR%%/i18n/ro.json
 %%WWWDIR%%/i18n/ru.json
 %%WWWDIR%%/i18n/si.json
 %%WWWDIR%%/i18n/sl.json
 %%WWWDIR%%/i18n/sq.json
 %%WWWDIR%%/i18n/sr.json
 %%WWWDIR%%/i18n/sv.json
 %%WWWDIR%%/i18n/th.json
 %%WWWDIR%%/i18n/tr.json
 %%WWWDIR%%/i18n/uk.json
 %%WWWDIR%%/i18n/vi.json
 %%WWWDIR%%/i18n/zh-CN.json
 %%WWWDIR%%/i18n/zh-TW.json
 %%WWWDIR%%/templates/cloud_14_day_arrears.html
 %%WWWDIR%%/templates/cloud_30_day_arrears.html
 %%WWWDIR%%/templates/cloud_45_day_arrears.html
 %%WWWDIR%%/templates/cloud_7_day_arrears.html
 %%WWWDIR%%/templates/cloud_90_day_arrears.html
 %%WWWDIR%%/templates/cloud_renewal_notification.html
 %%WWWDIR%%/templates/cloud_upgrade_confirmation.html
 %%WWWDIR%%/templates/cloud_welcome_email.html
 %%WWWDIR%%/templates/deactivate_body.html
 %%WWWDIR%%/templates/email_change_body.html
 %%WWWDIR%%/templates/email_change_verify_body.html
 %%WWWDIR%%/templates/email_footer.html
 %%WWWDIR%%/templates/email_info.html
 %%WWWDIR%%/templates/globalrelay_compliance_export.html
 %%WWWDIR%%/templates/globalrelay_compliance_export_message.html
 %%WWWDIR%%/templates/globalrelay_compliance_export_participant_row.html
 %%WWWDIR%%/templates/invite_body.html
 %%WWWDIR%%/templates/ip_filters_changed.html
 %%WWWDIR%%/templates/license_up_for_renewal.html
 %%WWWDIR%%/templates/messages_notification.html
 %%WWWDIR%%/templates/mfa_change_body.html
 %%WWWDIR%%/templates/password_change_body.html
 %%WWWDIR%%/templates/payment_failed_body.html
 %%WWWDIR%%/templates/payment_failed_no_card_body.html
 %%WWWDIR%%/templates/remove_expired_license.html
 %%WWWDIR%%/templates/reset_body.html
 %%WWWDIR%%/templates/signin_change_body.html
 %%WWWDIR%%/templates/unsupported_browser.html
 %%WWWDIR%%/templates/unsupported_browser.js
 %%WWWDIR%%/templates/verify_body.html
 %%WWWDIR%%/templates/warn_metric_ack.html
 %%WWWDIR%%/templates/welcome_body.html