diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile
index 24b8a35d2638..64d553b22231 100644
--- a/audio/mumble-server/Makefile
+++ b/audio/mumble-server/Makefile
@@ -1,75 +1,73 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.857
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-server
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Server component of Mumble
 WWW=		https://www.mumble.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++17-lang pkgconfig python:build qt:5 ssl
 USE_CXXSTD=	c++17
 USE_QT=		buildtools:build core dbus network qmake:build sql xml
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX:S|-|_|}
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	server
 CMAKE_OFF=	client
 
 CXXFLAGS+=	-Wno-deprecated-declarations
 
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 USERS=		${PORTNAME}${PKGNAMESUFFIX}
 GROUPS=		${USERS}
 
 PLIST_SUB=	GROUPS=${GROUPS}
 PORTDOCS=	README.md README.static.linux SECURITY.md
 
 OPTIONS_DEFINE=		AVAHI DOCS ICE LTO
 OPTIONS_DEFAULT=	AVAHI LTO MYSQL SQLITE
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE
 
 ICE_DESC=		Ice Support
 
 AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 AVAHI_CMAKE_BOOL=	zeroconf
 
 ICE_LIB_DEPENDS=	libIce.so:devel/ice37
 ICE_CMAKE_BOOL=		ice
 
 LTO_CMAKE_BOOL=		lto
 
 MYSQL_USE=		QT=sql-mysql:run
 PGSQL_USE=		QT=sql-pgsql:run
 SQLITE_USE=		QT=sql-sqlite3:run
 
-.include <bsd.port.pre.mk>
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${WRKSRC}/docs/additional-readmes/README.static.linux ${WRKSRC}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	${REINPLACE_CMD} -e '\
 			s|database=.*|database=/var/db/mumble-server/mumble-server.sqlite| ; \
 			s|;pidfile=.*|pidfile=/var/run/mumble-server/mumble-server.pid| ; \
-			s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log| ; \
-			s|;host=.*|host=0.0.0.0|' \
+			s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log|' \
 		${STAGEDIR}${ETCDIR}/mumble-server.ini
 	${MV}   ${STAGEDIR}${ETCDIR}/mumble-server.ini \
 		${STAGEDIR}${ETCDIR}/mumble-server.ini.sample
 	${RM}   ${STAGEDIR}${PREFIX}/bin/mumble-server-user-wrapper \
 		${STAGEDIR}${PREFIX}/share/man/man1/mumble-server-user-wrapper.1
 
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MV} ${WRKSRC}/docs/additional-readmes/README.static.linux ${WRKSRC}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mumble-server/files/patch-src_murmur_Server.cpp b/audio/mumble-server/files/patch-src_murmur_Server.cpp
new file mode 100644
index 000000000000..dafcfcf704cd
--- /dev/null
+++ b/audio/mumble-server/files/patch-src_murmur_Server.cpp
@@ -0,0 +1,18 @@
+--- src/murmur/Server.cpp.orig	2025-10-11 18:24:04 UTC
++++ src/murmur/Server.cpp
+@@ -181,6 +181,15 @@ Server::Server(int snum, QObject *p) : QThread(p) {
+ 			} else {
+ #ifdef Q_OS_UNIX
+ 				int val = 0xe0;
++#ifdef __FreeBSD__
++				if (addr.ss_family == AF_INET6) {
++					if (setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val))) {
++						val = 0x80;
++						if (setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)))
++							log(QString("Server: Failed to set IPV6_TCLASS for UDP Socket, errno = ").arg(errno));
++					}
++				} else
++#endif
+ 				if (setsockopt(sock, IPPROTO_IP, IP_TOS, &val, sizeof(val))) {
+ 					val = 0x80;
+ 					if (setsockopt(sock, IPPROTO_IP, IP_TOS, &val, sizeof(val)))