diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index c22324ee4f96..af0e06a1217f 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -1,347 +1,351 @@
 PORTNAME=	onlyoffice-documentserver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
-		https://nodejs.org/dist/v${_PKGFETCH_NODE_VERSION}/:source2
+		https://nodejs.org/dist/v${_PKGFETCH_NODE_VERSION}/:source2 \
+		https://github.com/fsbruva/onlyoffice-DS-npm-cache/releases/download/${_NPM_CACHE_TAG}/:source3
 DISTFILES+=	v8-8.9.255.25_all.tar.gz:source1 \
-		node-v${_PKGFETCH_NODE_VERSION}.tar.gz:source2
+		node-v${_PKGFETCH_NODE_VERSION}.tar.gz:source2 \
+		onlyoffice-DS-npm-cache-${_NPM_CACHE_TAG}.tar.gz:source3
 
 MAINTAINER=	fsbruva@yahoo.com
 COMMENT=	Secure office and productivity apps
 WWW=		https://www.onlyoffice.com/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64 and arm64
 
-# node version used with "npm install @yao-pkg/pkg@6.14.1"
-# keep in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile
+# node version used with "npm install" inside ${WRKSRC}/yao-pkg
+# kept in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile
 _DS_BUILD=		8
-_DS_SHARP_VER=		0.32.6
-_PKGFETCH_NODE_VERSION=	20.20.0
-_YAOPKG_VER=		6.14.1
+_PKGFETCH_NODE_VERSION=	24.14.1
+_NPM_CACHE_TAG= ${_DS_TAGNAME}-202604230220
+# end of cache build config
+
 _NODE_DISTFILE=	node-v${_PKGFETCH_NODE_VERSION}.tar.gz
+WRKSRC_npm_cache= ${WRKDIR}/onlyoffice-DS-npm-cache-${_NPM_CACHE_TAG}
 
 # Map FreeBSD ARCH to the node/sharp platform-arch suffix
 .if ${MACHINE_ARCH} == aarch64
 _SHARP_NODE_ARCH=   arm64v8
 .else
 _SHARP_NODE_ARCH=   x64
 .endif
 
 _SHARP_NODE_FILE=   sharp-freebsd-${_SHARP_NODE_ARCH}.node
 _SHARP_INSTALL_DIR= ${WWWDIR}/documentserver/server/DocService/sharp
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		boost-libs>0:devel/boost-libs \
 		glib>=2.54:devel/glib20 \
 		gn:devel/gn \
 		ninja:devel/ninja \
-		npm:www/npm-node20 \
+		npm:www/npm-node24 \
 		optipng:graphics/optipng
 
-# Need libvips because npm module sharp requires it on Unix OS's
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libbrotlicommon.so:archivers/brotli \
 		libbrotlidec.so:archivers/brotli \
 		libcurl.so:ftp/curl \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libgumbo.so:devel/gumbo \
 		libharfbuzz.so:print/harfbuzz \
 		libheif.so:graphics/libheif \
 		libicudata.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libmd4c-html.so:textproc/md4c \
 		libmd4c.so:textproc/md4c \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		librevenge-0.0.so:textproc/librevenge \
 		libvips.so:graphics/vips
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		gsed:textproc/gsed \
 		nginx:www/nginx \
 		pwgen:sysutils/pwgen \
 		rabbitmq>0:net/rabbitmq \
 		webfonts>=0:x11-fonts/webfonts
 
 USES=		autoreconf:build dos2unix fakeroot gmake gnome iconv:wchar_t localbase java:build pkgconfig \
 		python:build qt:5 ssl trigger
 
 BROKEN_SSL=	boringssl libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js requires OpenSSL
 
 DOS2UNIX_FILES=	document-server-package/common/documentserver/nginx/includes/http-common.conf.m4
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ONLYOFFICE
 GH_PROJECT=	DocumentServer
 _DS_TAGNAME=	${DISTVERSIONPREFIX}${DISTVERSION}.${_DS_BUILD}
 GH_TUPLE=	ONLYOFFICE:build_tools:${_DS_TAGNAME}:buildtools/build_tools \
 		ONLYOFFICE:core:${_DS_TAGNAME}:core/core \
 		ONLYOFFICE:core-fonts:${_DS_TAGNAME}:corefonts/core-fonts \
 		ONLYOFFICE:dictionaries:${_DS_TAGNAME}:dictionaries/dictionaries \
 		ONLYOFFICE:document-formats:${_DS_TAGNAME}:df/document-formats \
 		ONLYOFFICE:document-server-integration:${_DS_TAGNAME}:dsi/document-server-integration \
 		ONLYOFFICE:document-server-package:${_DS_TAGNAME}:dsp/document-server-package \
 		ONLYOFFICE:document-templates:${_DS_TAGNAME}:dt/document-templates \
 		ONLYOFFICE:sdkjs:${_DS_TAGNAME}:sdkjs/sdkjs \
 		ONLYOFFICE:server:${_DS_TAGNAME}:server/server \
 		ONLYOFFICE:web-apps:${_DS_TAGNAME}:webapps/web-apps \
 		ONLYOFFICE:DocumentBuilder:626d1e44db3d06ceb8298215a67ef0475912d89a:document_builder/DocumentBuilder \
 		ONLYOFFICE:onlyoffice.github.io:b26d001664d771df4f663d2d3ba7dd4a188b6cab:sdkjs_plugins_v1/onlyoffice.github.io \
 		jasenhuang:katana-parser:be6df45:jasenhuang_katana/core/Common/3dParty/html/katana-parser \
-		hunspell:hyphen:73dd296:hunspell_hyphen/core/Common/3dParty/hyphen/hyphen \
-		fsbruva:onlyoffice-DS-npm-cache:${_DS_TAGNAME}-202603231741-prodmatch:npm_cache
+		hunspell:hyphen:73dd296:hunspell_hyphen/core/Common/3dParty/hyphen/hyphen
 
 JAVA_VERSION=	11+
 
 USE_LDCONFIG=	yes
 USE_QT=		qmake:build
 
 MAKE_ENV=	BUILD_NUMBER=${_DS_BUILD} \
 		npm_package_config_node_gyp_nodedir=${LOCALBASE} \
 		npm_package_config_node_gyp_python=${PYTHON_CMD} \
+		NODE_OPTIONS=--max-old-space-size=3072 \
 		PKG_BUILD_PATH=${WRKDIR}/.pkg-build \
 		PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
 		PRODUCT_VERSION=${DISTVERSION} \
 		PYTHON=${PYTHON_CMD}
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
-CONFLICTS_BUILD=	devel/googletest
-
 # do not strip docservice, converter, metrics and json
 STRIP=
 
 ETCDIR=		${PREFIX}/etc/onlyoffice
 WWWDIR=		${PREFIX}/www/onlyoffice
 
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		strip=true
 
 SUB_FILES=	pkg-message \
 		onlyoffice.newsyslog.sample
 SUB_LIST=	DS_GROUPNAME=${DS_GROUPNAME} \
 		DS_USERNAME=${DS_USERNAME} \
 		ETCDIR=${ETCDIR} \
 		PREFIX=${PREFIX} \
 		WWWDIR=${WWWDIR}
 
 DS_USERNAME=	onlyoffice
 DS_GROUPNAME=	onlyoffice
 
 USERS=		${DS_USERNAME}
 GROUPS=		${DS_GROUPNAME}
 
 PLIST_SUB=	DS_GROUPNAME=${DS_GROUPNAME} \
 		DS_USERNAME=${DS_USERNAME} \
 		SHARP_NODE_FILE=${_SHARP_NODE_FILE}
 
 OPTIONS_DEFAULT=	PGSQL
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL
 
 MYSQL_USES+=	mysql:client
 PGSQL_USES+=	pgsql
 PGSQL_VARS=	WANT_PGSQL=client
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == aarch64
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=	ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 		c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 		cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 		ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} \
 		nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT}
 .endif
 
 post-extract:
 	@${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8_89
 
 	@${LN} -s ${WRKSRC_npm_cache} ${WRKDIR}/.npm
 	@${MKDIR} ${WRKDIR}/.pkg-build
 	@${MKDIR} -p ${WRKDIR}/.pkg-cache/node
 
 	# Copy node tarball to pkg-cache directory, and create sha256sum file
 	@${CP} ${DISTDIR}/${_NODE_DISTFILE} ${WRKDIR}/.pkg-cache/node
 	@${EGREP} '^\s*SHA256[[:space:]]\(${_NODE_DISTFILE}\)' \
 			${.CURDIR}/distinfo | \
 			${AWK} '{print $$4 "  ${_NODE_DISTFILE}"}' \
 			> ${WRKDIR}/.pkg-cache/node/${_NODE_DISTFILE}.sha256sum
 	@${ECHO_MSG} "===>  Created pkg-fetch cache entry for ${_NODE_DISTFILE}"
 
 	@${MKDIR} ${WRKSRC}/sdkjs-plugins/v1
 	@${CP} ${WRKSRC}/onlyoffice.github.io/sdkjs-plugins/v1/* ${WRKSRC}/sdkjs-plugins/v1
 
 	@${MV} ${WRKSRC}/server/Common/config/production-linux.json ${WRKSRC}/server/Common/config/production-freebsd.json
 	@${MV} ${WRKSRC}/server/Common/config/development-linux.json ${WRKSRC}/server/Common/config/development-freebsd.json
 
 	# linux has moved to systemd init files, continue to using supervisord for now
 	${MKDIR} ${WRKSRC}/document-server-package/common/documentserver/supervisor
 .for i in ds-converter.conf ds-docservice.conf ds-metrics.conf ds.conf
 	${CP} ${FILESDIR}/${i} \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor
 .endfor
 
 pre-configure:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/build_tools/tools/freebsd/automate.py \
 		${WRKSRC}/core/Apple/IWork.pro \
 		${WRKSRC}/core/Common/3dParty/boost/boost.pri \
 		${WRKSRC}/core/Common/3dParty/brotli/brotli.pri \
 		${WRKSRC}/core/Common/3dParty/heif/heif.pri \
 		${WRKSRC}/core/Common/3dParty/html/gumbo.pri \
 		${WRKSRC}/core/Common/3dParty/icu/icu.pri \
 		${WRKSRC}/core/Common/3dParty/md/md2html.pri \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/buildtools/third_party/libc++/BUILD.gn \
 		${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp \
 		${WRKSRC}/core/X2tConverter/build/Qt/X2tConverter.pri \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-pluginsmanager.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-static-gzip.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-converter.conf \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-metrics.conf \
 		${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/core/Common/base.pri
 	@${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} 's|%%WRKSRC%%|${WRKSRC}|' \
 		${WRKSRC}/build_tools/scripts/build_js.py \
 		${WRKSRC}/build_tools/scripts/build_server.py \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} 's|%%PKGFETCH_NODE_MAJOR_VERSION%%|${_PKGFETCH_NODE_VERSION:C/^([0-9]+)\..*/\1/}|' \
 		${WRKSRC}/build_tools/scripts/build_server.py \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} -e 's|/var/lib|/var/db|' -e 's|/var/www|${LOCALBASE}/www|' \
 			  -e 's|/usr/share|${LOCALBASE}/share|' -e 's|/etc|${LOCALBASE}/etc|' \
 		${WRKSRC}/server/Common/config/production-freebsd.json \
 		${WRKSRC}/server/Common/config/development-freebsd.json
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%ETCDIR%%|${ETCDIR}|' \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4 \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} 's|%%OPENSSL_LIB%%|${OPENSSLLIB}|' \
 		${WRKSRC}/core/Common/3dParty/openssl/openssl.pri
 	@${RM} ${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch.orig
 
 	# Copy new package.json for sdkjs root
 	@${CP} ${WRKSRC_npm_cache}/sdkjs-package.json ${WRKSRC}/sdkjs/package.json
 	@${ECHO_MSG} "  Installed: sdkjs/package.json"
 
 	# Copy optimized shrinkwrap files from cache repo, overwriting upstream
 	@${ECHO_MSG} "Installing optimized npm-shrinkwrap.json files..."
 	@(cd ${WRKSRC_npm_cache}/shrinkwrap && \
 		${FIND} . -name npm-shrinkwrap.json | while read shrinkwrap; do \
 			rel_path=$${shrinkwrap#./}; \
 			target="${WRKSRC}/$${rel_path}"; \
 			target_dir=$$(dirname "$$target"); \
 			${MKDIR} -p "$$target_dir"; \
 			${CP} "$$shrinkwrap" "$$target"; \
 			${ECHO_MSG} "  Installed: $${rel_path}"; \
 		done)
 
 	@${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni
 	@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni
 
 do-build:
 	${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKDIR}/.bin/npm
 
 	@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts
 	@cd ${WRKSRC}/web-apps/build ; node_modules/.bin/patch-package
 	@cd ${WRKSRC}/web-apps/build/node_modules/optipng-bin ; ${SETENV} ${MAKE_ENV} npm run postinstall optipng-bin
 
 	@cd ${WRKSRC}/sdkjs ; ${SETENV} ${MAKE_ENV} npm install
 
 	# During offline builds the install script doesn't run, and must patch for external native addon
 	@cd ${WRKSRC}/server/DocService ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts
 	@cd ${WRKSRC}/server/DocService ; node_modules/.bin/patch-package
 	@cd ${WRKSRC}/server/DocService/node_modules/sharp ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm run install
 
+	# Install Metrics dependencies and patch statsd for Node 24 compatibility
+	# (util.log was removed in Node 23; patch replaces it with console.log)
+	@cd ${WRKSRC}/server/Metrics ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts
+	@cd ${WRKSRC}/server/Metrics ; node_modules/.bin/patch-package
+
 	@${MKDIR} ${WRKSRC}/yao-pkg
 	@${CP} ${WRKSRC_npm_cache}/yao-pkg-package.json      ${WRKSRC}/yao-pkg/package.json
-	@${CP} ${WRKSRC_npm_cache}/yao-pkg-package-lock.json ${WRKSRC}/yao-pkg/package-lock.json
-	@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@${_YAOPKG_VER}
+	@${CP} ${WRKSRC_npm_cache}/yao-pkg-npm-shrinkwrap-${MACHINE_ARCH}.json ${WRKSRC}/yao-pkg/npm-shrinkwrap.json
+	@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install
 
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js || ${TRUE}
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${WRKSRC_npm_cache}/extra-patch-pkg-fetch_patches_node.v${_PKGFETCH_NODE_VERSION}.cpp.patch || ${TRUE}
 
 	cd ${WRKSRC}/build_tools/tools/freebsd ; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} automate.py
-
-# Warning regarding missing modern-syslog is harmless - unused syslog backend of statsd requires it
 	cd ${WRKSRC}/document-server-package ; ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd
 
 do-install:
 # install the project
 # do not strip docservice, converter, metrics and json
 	cd ${WRKSRC}/document-server-package/common/documentserver/home && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/documentserver
 	${INSTALL_SCRIPT} ${WRKSRC}/document-server-package/common/documentserver/bin/*.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/all* ${STAGEDIR}${WWWDIR}/documentserver/server/tools
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/x2t ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/docbuilder ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/pluginsmanager ${STAGEDIR}${WWWDIR}/documentserver/server/tools
 	${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm
 	${INSTALL_LIB} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/*.so ${STAGEDIR}${PREFIX}/lib
 
 # install conf
 	${MKDIR} ${STAGEDIR}${ETCDIR}/documentserver/supervisor \
 		 ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes \
 		 ${STAGEDIR}${ETCDIR}/documentserver/logrotate
 	${RM} ${WRKSRC}/document-server-package/common/documentserver/config/*-mac.json ${WRKSRC}/document-server-package/common/documentserver/config/*-windows.json
 	cd ${WRKSRC}/document-server-package/common/documentserver/supervisor && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/supervisor "-name *\.conf"
 	cd ${WRKSRC}/document-server-package/common/documentserver/logrotate && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/logrotate "-name *\.conf"
 	${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf.tmpl ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf
 .for f in ds.conf ds-ssl.conf includes/http-common.conf includes/ds-common.conf \
 	includes/ds-docservice.conf includes/ds-letsencrypt.conf \
 	includes/ds-mime.types.conf
 	${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/nginx/${f} ${STAGEDIR}${ETCDIR}/documentserver/nginx/${f}.sample
 .endfor
 	@echo "# Production ds-cache.conf is created automatically by documentserver-flush-cache.sh" > ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes/ds-cache.conf.sample
 	cd ${WRKSRC}/document-server-package/common/documentserver/nginx/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes "-name *\.conf"
 	cd ${WRKSRC}/document-server-package/common/documentserver/config && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver
 	${INSTALL_DATA} ${FILESDIR}/local.json.sample ${STAGEDIR}${ETCDIR}/documentserver
 	${MKDIR} ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/onlyoffice.newsyslog.sample ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d
 
 # Install arch-specific sharp native binding adjacent to the docservice
 # binary.  sharp.js resolves this at runtime via path.dirname(process.execPath).
 	@${MKDIR} ${STAGEDIR}${_SHARP_INSTALL_DIR}
 	${INSTALL_LIB} \
 		${WRKSRC}/server/DocService/node_modules/sharp/build/Release/${_SHARP_NODE_FILE} \
 		${STAGEDIR}${_SHARP_INSTALL_DIR}/${_SHARP_NODE_FILE}
 
 # create missing dir
 	${MKDIR} ${STAGEDIR}/var/log/onlyoffice/documentserver/docservice \
 		 ${STAGEDIR}/var/log/onlyoffice/documentserver/converter \
 		 ${STAGEDIR}/var/log/onlyoffice/documentserver/metrics \
 		 ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/cache/files \
 		 ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/docbuilder \
 		 ${STAGEDIR}${WWWDIR}/Data \
 		 ${STAGEDIR}${WWWDIR}/documentserver/fonts
 
 post-install:
 # Remove unwanted files from STAGE
 	${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh
 	${RM} ${STAGEDIR}${WWWDIR}/documentserver/server/Common/config/*.bak
 	${RM} ${STAGEDIR}${WWWDIR}/documentserver/dictionaries/sl_SI/hyph_sl_SI.dic.bak
 
 # formats@2.5x.svg is generated by grunt-svg-sprite (web-apps/build/sprites/Gruntfile.js) as
 # part of the editor-specific deploy phase, which runs after the common deploy step that would
 # have copied it to staging via its **/*.svg glob. Copy it manually until fixed upstream.
 	${INSTALL_DATA} ${WRKSRC}/web-apps/apps/common/main/resources/img/doc-formats/formats@2.5x.svg \
 		${STAGEDIR}${WWWDIR}/documentserver/web-apps/apps/common/main/resources/img/doc-formats/
 
 .include <bsd.port.post.mk>
diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo
index c19343463f41..f3410c9cd3f2 100644
--- a/www/onlyoffice-documentserver/distinfo
+++ b/www/onlyoffice-documentserver/distinfo
@@ -1,39 +1,39 @@
-TIMESTAMP = 1774288218
+TIMESTAMP = 1776911257
 SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
 SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
-SHA256 (node-v20.20.0.tar.gz) = cafc92e90917c17869d982fdff10104c2eb328437ed9bbf03fdda78ebc0accdd
-SIZE (node-v20.20.0.tar.gz) = 88277321
+SHA256 (node-v24.14.1.tar.gz) = 8298cf1f5774093ca819f41b8dd392fd2cff058688b4d5c8805026352e2d31b3
+SIZE (node-v24.14.1.tar.gz) = 113042895
+SHA256 (onlyoffice-DS-npm-cache-v9.3.1.8-202604230220.tar.gz) = fdebf49310b42a8784a7e240df0132ada1b5878a9d62b521ae76d8f5c01a379c
+SIZE (onlyoffice-DS-npm-cache-v9.3.1.8-202604230220.tar.gz) = 123896527
 SHA256 (ONLYOFFICE-DocumentServer-v9.3.1_GH0.tar.gz) = 6df95aa91341504dbee888612552cfd474797d9e1c1f3d97553c4090f9230dcd
 SIZE (ONLYOFFICE-DocumentServer-v9.3.1_GH0.tar.gz) = 982188
 SHA256 (ONLYOFFICE-build_tools-v9.3.1.8_GH0.tar.gz) = 68204c339f27ddf56e1d8aacb1ea79afab18555bb3c964fe70a8142539d64e13
 SIZE (ONLYOFFICE-build_tools-v9.3.1.8_GH0.tar.gz) = 6729536
 SHA256 (ONLYOFFICE-core-v9.3.1.8_GH0.tar.gz) = e343283af69022e7d59a986f4e4d9732658a635a3e052ca3a17691a9f0e301dd
 SIZE (ONLYOFFICE-core-v9.3.1.8_GH0.tar.gz) = 221297375
 SHA256 (ONLYOFFICE-core-fonts-v9.3.1.8_GH0.tar.gz) = 8e3355e1aec59908ae3d4eaa3dd9b044b65b8616b0bccb63479e333fa48762c3
 SIZE (ONLYOFFICE-core-fonts-v9.3.1.8_GH0.tar.gz) = 95377731
 SHA256 (ONLYOFFICE-dictionaries-v9.3.1.8_GH0.tar.gz) = f4cbbdd5de8e5c79ad58e95f2e823da84862e046936aa7374750dee8e6b31e03
 SIZE (ONLYOFFICE-dictionaries-v9.3.1.8_GH0.tar.gz) = 57973818
 SHA256 (ONLYOFFICE-document-formats-v9.3.1.8_GH0.tar.gz) = a700d2a83a183209d5e2c3f1b69b12519ab5461c01f32b6beff7d916ca1eabed
 SIZE (ONLYOFFICE-document-formats-v9.3.1.8_GH0.tar.gz) = 8398
 SHA256 (ONLYOFFICE-document-server-integration-v9.3.1.8_GH0.tar.gz) = 5619401fac97f67f501951c3c92211c4a6330a722f4fafa69db52a51949f66d2
 SIZE (ONLYOFFICE-document-server-integration-v9.3.1.8_GH0.tar.gz) = 6016685
 SHA256 (ONLYOFFICE-document-server-package-v9.3.1.8_GH0.tar.gz) = 260ac8d697c36fcd29e2f58a8a2b90e42ad480e2c8a379ecadc0b37598a0bc29
 SIZE (ONLYOFFICE-document-server-package-v9.3.1.8_GH0.tar.gz) = 191572
 SHA256 (ONLYOFFICE-document-templates-v9.3.1.8_GH0.tar.gz) = 18a0559a226394de9fe8a44b32984bd04265f784b75ac656c5365b908321ddd9
 SIZE (ONLYOFFICE-document-templates-v9.3.1.8_GH0.tar.gz) = 3914480
 SHA256 (ONLYOFFICE-sdkjs-v9.3.1.8_GH0.tar.gz) = 130bbca0e8017437bae9bd739ccd637b65ce57bda2a842c11ddfc437673d2be0
 SIZE (ONLYOFFICE-sdkjs-v9.3.1.8_GH0.tar.gz) = 39754071
 SHA256 (ONLYOFFICE-server-v9.3.1.8_GH0.tar.gz) = 23bbbd20f1409ac6c6e739d18a235b086a6d5e4192c1e45ba50cd692c6c67f6d
 SIZE (ONLYOFFICE-server-v9.3.1.8_GH0.tar.gz) = 470282
 SHA256 (ONLYOFFICE-web-apps-v9.3.1.8_GH0.tar.gz) = 81d454101728d0efc4d78e26c0d0ec59a4b7ff917193df99db4b131c45baf4de
 SIZE (ONLYOFFICE-web-apps-v9.3.1.8_GH0.tar.gz) = 450219620
 SHA256 (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 275c3a8c993528fa56c69aedb11dd74a6fba9c3bd372874004584ae9cbb190b5
 SIZE (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 31659
 SHA256 (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 347b8f1d3c21b1f61a3f1fcae86f402b27ce4f8b826e18158834251046d83cf5
 SIZE (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 17009005
 SHA256 (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 363ede45ba6d125fdb7323c43d34acd3d0ae9028ac18aec632eb6a623160f09a
 SIZE (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 97712
 SHA256 (hunspell-hyphen-73dd296_GH0.tar.gz) = 93e80ad69ee7afd507b12f0b58ca34a6a78347dcbb5fe5d9b6f0e19b02397ef7
 SIZE (hunspell-hyphen-73dd296_GH0.tar.gz) = 292528
-SHA256 (fsbruva-onlyoffice-DS-npm-cache-v9.3.1.8-202603231741-prodmatch_GH0.tar.gz) = 9cd92a0e34fd5c1d5752a6ea7214fbd7eca08ca68dc6235b13cd9e5f5d6e93e8
-SIZE (fsbruva-onlyoffice-DS-npm-cache-v9.3.1.8-202603231741-prodmatch_GH0.tar.gz) = 126774789
diff --git a/www/onlyoffice-documentserver/files/npm b/www/onlyoffice-documentserver/files/npm
index 303b86ba9102..c2ab697743bc 100644
--- a/www/onlyoffice-documentserver/files/npm
+++ b/www/onlyoffice-documentserver/files/npm
@@ -1,3 +1,3 @@
 #!/bin/sh
-exec %%LOCALBASE%%/bin/npm --offline "$@"
+exec %%LOCALBASE%%/bin/npm --offline --no-fund --no-audit "$@"
 #exec %%LOCALBASE%%/bin/npm "$@"
diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py
index 8cd2beb29729..6bba2b42f322 100644
--- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py
+++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py
@@ -1,39 +1,39 @@
 --- build_tools/scripts/build_server.py.orig	2026-02-22 20:21:43 UTC
 +++ build_tools/scripts/build_server.py
 @@ -40,8 +40,12 @@
        base.copy_file(custom_public_key, server_dir + '/Common/sources')
  
    #node22 packaging has issue https://github.com/yao-pkg/pkg/issues/87
 -  pkg_target = "node20"
 +  pkg_target = "node%%PKGFETCH_NODE_MAJOR_VERSION%%"
  
 +  if ("freebsd" == base.host_platform()):
 +    pkg_target += "-freebsd"
 +    pkgBin = "%%WRKSRC%%/yao-pkg/node_modules/.bin/pkg"
 +
    if ("linux" == base.host_platform()):
      pkg_target += "-linux"
      if (-1 != config.option("platform").find("linux_arm64")):
 @@ -50,16 +54,16 @@
    if ("windows" == base.host_platform()):
      pkg_target += "-win"
  
 -  base.cmd_in_dir(server_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=6144", "-o", "docservice"])
 -  base.cmd_in_dir(server_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"])
 -  base.cmd_in_dir(server_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"])
-+  base.cmd_in_dir(server_dir + "/DocService", pkgBin, [".", "-t", pkg_target, "--options", "max_old_space_size=6144", "-o", "docservice"])
-+  base.cmd_in_dir(server_dir + "/FileConverter", pkgBin, [".", "-t", pkg_target, "-o", "converter"])
-+  base.cmd_in_dir(server_dir + "/Metrics", pkgBin, [".", "-t", pkg_target, "-o", "metrics"])
++  base.cmd_in_dir(server_dir + "/DocService", pkgBin, [".", "-t", pkg_target, "--options", "max_old_space_size=6144", "-o", "docservice", "--fallback-to-source"])
++  base.cmd_in_dir(server_dir + "/FileConverter", pkgBin, [".", "-t", pkg_target, "-o", "converter", "--fallback-to-source"])
++  base.cmd_in_dir(server_dir + "/Metrics", pkgBin, [".", "-t", pkg_target, "-o", "metrics", "--fallback-to-source"])
    if "server-admin-panel" in base.get_server_addons() and base.is_exist(server_admin_panel_dir):
 -    base.cmd_in_dir(server_admin_panel_dir + "/server", "pkg", [".", "-t", pkg_target, "-o", "adminpanel"])
-+    base.cmd_in_dir(server_admin_panel_dir + "/server", pkgBin, [".", "-t", pkg_target, "-o", "adminpanel"])
++    base.cmd_in_dir(server_admin_panel_dir + "/server", pkgBin, [".", "-t", pkg_target, "-o", "adminpanel", "--fallback-to-source"])
  
    example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs"
 -  base.delete_dir(example_dir  + "/node_modules")
 +#  base.delete_dir(example_dir  + "/node_modules")
    base.cmd_in_dir(example_dir, "npm", ["ci"])
 -  base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"])
-+  base.cmd_in_dir(example_dir, pkgBin, [".", "-t", pkg_target, "-o", "example"])
++  base.cmd_in_dir(example_dir, pkgBin, [".", "-t", pkg_target, "-o", "example", "--fallback-to-source"])
  
  def build_server_with_addons():
    addons = {}
diff --git a/www/onlyoffice-documentserver/files/patch-server_Metrics_package.json b/www/onlyoffice-documentserver/files/patch-server_Metrics_package.json
new file mode 100644
index 000000000000..ef7e91561bea
--- /dev/null
+++ b/www/onlyoffice-documentserver/files/patch-server_Metrics_package.json
@@ -0,0 +1,10 @@
+--- server/Metrics/package.json.orig	2026-02-24 18:13:24 UTC
++++ server/Metrics/package.json
+@@ -5,6 +5,7 @@
+   "private": true,
+   "bin": "node_modules/statsd/bin/statsd",
+   "dependencies": {
++    "patch-package": "^8.0.0",
+     "statsd": "0.9.0"
+   },
+   "pkg": {
diff --git a/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_statsd b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_statsd
new file mode 100644
index 000000000000..3b2c6e7a0f28
--- /dev/null
+++ b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_statsd
@@ -0,0 +1,64 @@
+--- server/Metrics/patches/statsd+0.9.0.patch.orig	2026-04-22 04:51:23 UTC
++++ server/Metrics/patches/statsd+0.9.0.patch
+@@ -0,0 +1,61 @@
++diff --git a/node_modules/statsd/lib/config.js b/node_modules/statsd/lib/config.js
++index 11ff71c..d36abae 100644
++--- a/node_modules/statsd/lib/config.js
+++++ b/node_modules/statsd/lib/config.js
++@@ -10,7 +10,7 @@ let Configurator = function (file) {
++   let oldConfig = {};
++ 
++   this.updateConfig = function () {
++-    util.log('[' + process.pid + '] reading config file: ' + file);
+++    console.log('[' + process.pid + '] reading config file: ' + file);
++ 
++     fs.readFile(file, function (err, data) {
++       if (err) { throw err; }
++diff --git a/node_modules/statsd/lib/logger.js b/node_modules/statsd/lib/logger.js
++index 8867f82..81e2108 100644
++--- a/node_modules/statsd/lib/logger.js
+++++ b/node_modules/statsd/lib/logger.js
++@@ -22,7 +22,7 @@ Logger.prototype = {
++       if (!type) {
++         type = 'DEBUG';
++       }
++-      this.util.log(type + ": " + msg);
+++      this.console.log(type + ": " + msg);
++     } else {
++       let level;
++       if (!type) {
++@@ -35,7 +35,7 @@ Logger.prototype = {
++         throw "Undefined log level: " + level;
++       }
++ 
++-      this.util.log(this.util[level], msg);
+++      this.console.log(this.util[level], msg);
++     }
++   }
++ };
++diff --git a/node_modules/statsd/lib/process_mgmt.js b/node_modules/statsd/lib/process_mgmt.js
++index a0dcf7b..bca534c 100644
++--- a/node_modules/statsd/lib/process_mgmt.js
+++++ b/node_modules/statsd/lib/process_mgmt.js
++@@ -8,7 +8,7 @@ exports.init = function(config) {
++ 
++   process.on('SIGTERM', function() {
++    if (conf.debug) {
++-     util.log('Starting Final Flush');
+++     console.log('Starting Final Flush');
++    }
++    healthStatus = 'down';
++    process.exit();
++diff --git a/node_modules/statsd/stats.js b/node_modules/statsd/stats.js
++index 75f5741..d8fae0c 100644
++--- a/node_modules/statsd/stats.js
+++++ b/node_modules/statsd/stats.js
++@@ -442,7 +442,7 @@ config.configFile(process.argv[2], function (config) {
++     );
++ 
++     serversLoaded = true;
++-    util.log("server is up", "INFO");
+++    console.log("server is up", "INFO");
++ 
++     pctThreshold = config.percentThreshold || 90;
++     if (!Array.isArray(pctThreshold)) {