diff --git a/sysutils/bareos22-server/Makefile b/sysutils/bareos22-server/Makefile
index 5a16922884de..856127c768b9 100644
--- a/sysutils/bareos22-server/Makefile
+++ b/sysutils/bareos22-server/Makefile
@@ -1,237 +1,237 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	22.1.4
+DISTVERSION=	22.1.6
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	22-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 WWW=		https://www.bareos.org/
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 CONFLICTS?=	bareos-server bareos20-server bareos21-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
 USES+=		cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \
 		shebangfix
 USE_GITHUB=	yes
 USE_PERL5=	run
 
 USERS=		bareos
 GROUPS=		${USERS}
 
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 USE_LDCONFIG=	yes
 SHEBANG_LANG=	perl python
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_backup.pl.in \
 		${WRKSRC}/contrib/misc/bsmc/bin/bsmc
 
 CPPFLAGS+=	-I${LOCALBASE}/readline
 
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		CRYPTO
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
 OPTIONS_SUB=		yes
 CRYPTO_DESC=		Cryptographic library
 MTX_DESC=		Install mtx for control of autochanger devices
 NDMP_DESC=		Enable build of NDMP support
 SCSICRYPTO_DESC=	Build LTO AME crypto plugin
 
 .if ${PKGNAMESUFFIX} == "22-server"
 OPTIONS_GROUP=	BACKENDS
 OPTIONS_GROUP_BACKENDS=	GFAPI
 OPTIONS_DEFINE=		MTX PYTHON LMDB NDMP NLS SCSICRYPTO
 OPTIONS_DEFAULT+=	LMDB PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	PGSQL
 OPTIONS_SINGLE+=		DATABASE
 BACKENDS_DESC=		Storage backends
 DATABASE_DESC=		Database support
 GFAPI_DESC=	GFAPI backend support
 LMDB_DESC=	Enable faster accurate backup support
 
 NDMP_CMAKE_ON=	-Dndmp=ON
 NDMP_CMAKE_OFF=	-Dndmp=OFF
 .endif
 
 GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 OPENSSL_USES=		ssl
 OPENSSL_CMAKE_ON=	-Dopenssl=ON
 OPENSSL_CMAKE_OFF=	-Dopenssl=OFF
 
 SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
 SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
 
 .if ${PKGNAMESUFFIX} == "22-client" || ${PKGNAMESUFFIX} == "22-server"  #Till end of the file
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON=ON
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=OFF
 PYTHON_PLUGIN=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbareos.so:sysutils/bareos22-client
 USE_RC_SUBR?=	bareos-dir bareos-sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
 .else
 SUB_FILES+=	pkg-message.server
 .endif
 
 CMAKE_ARGS+=	-Dtcp-wrappers=ON \
 		-Dsmartalloc=ON \
 		-Dsysconfdir=${PREFIX}/etc \
 		-Darchivedir=${BAREOS_DIR}/storage \
 		-Dworkingdir=${BAREOS_DIR} \
 		-Dconfdir=${PREFIX}/etc/bareos \
 		-Dlibdir=${PREFIX}/lib \
 		-Dlogdir=/var/log/bareos \
 		-Dincludedir=${PREFIX}/include/bareos \
 		-Dreadline=ON \
 		-Ddisable-conio=ON \
 		-Dbatch-insert=ON \
 		-Dhave_plugins=ON \
 		-Dplugindir=${PREFIX}/lib/bareos/plugins \
 		-Dscriptdir=${PREFIX}/lib/bareos/scripts \
 		-Dbackenddir=${PREFIX}/lib/bareos/backends \
 		-Ddump_email=root@localhost \
 		-Djob_email=root@localhost \
 		-Ddb_name=bareos \
 		-Dsbin-perm=755 \
 		-Ddb_user=bareos \
 		-Dbaseport=9101 \
 		-Dpiddir=/var/run/bareos
 
 .if defined(WITH_CLIENT_ONLY)
 CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 CMAKE_ARGS+=	-Dfd-user=root \
 		-Dfd-group=wheel \
 		-Dlmdb=ON
 .else
 LMDB_CMAKE_ON=	-Dlmdb=ON
 LMDB_CMAKE_OFF=	-Dlmdb=OFF
 LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
 		-Ddir-group=${BAREOS_GROUP} \
 		-Dsd-user=${BAREOS_USER} \
 		-Dsd-group=operator
 .endif
 
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
 #
 BAREOS_USER?=	bareos
 BAREOS_GROUP?=	${BAREOS_USER}
 BAREOS_UID?=	997
 BAREOS_GID?=	${BAREOS_UID}
 BAREOS_DIR?=	/var/db/bareos
 
 PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
 
 SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
 		BAREOS_GROUP=${BAREOS_GROUP} \
 		BAREOS_UID=${BAREOS_UID} \
 		BAREOS_GID=${BAREOS_GID} \
 		BAREOS_DIR=${BAREOS_DIR}
 
 NLS_USES=		gettext
 NLS_CMAKE_ON=		-Dnls=ON
 GFAPI_CMAKE_ON=		-Dgfapi=ON
 GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
 
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
 CONFFILES=	fd
 CMAKE_ARGS+=	-Dclient-only=ON
 
 PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
 PKGINSTALL=	${FILESDIR}/pkg-install.client
 .else
 # Server only Options
 CONFFILES=		sd dir
 CMAKE_ARGS+=	-Dbuild-dird=ON \
 		-Dbuild-stored=ON \
 		-Dbuild_client_only=OFF
 # Server default database
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 MYSQL_VARS=	DBTYPE=mysql
 MYSQL_SUB_LIST=	REQ_MYSQL=mysql REQ_PGSQL=""
 PGSQL_CMAKE_ON=		-Dpostgresql=ON
 PGSQL_USES=	pgsql
 PGSQL_VARS=	DBTYPE=postgresql
 PGSQL_SUB_LIST=		REQ_MYSQL="" REQ_PGSQL=postgresql
 SQLITE3_VARS=	DBTYPE=sqlite3
 
 PLIST_SUB+=		DBTYPE=${DBTYPE}
 
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 MP1+=	bconsole.1
 MP8+=	bareos-fd.8
 .else
 MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
 	btape.8 btraceback.8 bareos-dbcheck.8
 MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 .endif
 
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
 	@${REINPLACE_CMD}  '133,138d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "22-server"
 	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
 .if ${PKGNAMESUFFIX} == "22-client"
 	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
 .endif
 
 post-extract:
 .if defined(WITH_CLIENT_ONLY)
 .	if defined(PYTHON_PLUGIN)
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
 .	endif
 .endif
 	@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
 		${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
 	@${MV} ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf \
 		${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf.sample
 
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
 	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
 	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
 .endif
 	@${MKDIR} ${STAGEDIR}/var/run/bareos
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif # 22-client and 22-server are defined
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 USES+=	llvm:max=15
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/bareos22-server/distinfo b/sysutils/bareos22-server/distinfo
index 3eb2ba35cb90..1d43dc7a130a 100644
--- a/sysutils/bareos22-server/distinfo
+++ b/sysutils/bareos22-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714631090
-SHA256 (bareos-bareos-Release-22.1.4_GH0.tar.gz) = fd2d2eb7557907e1fe85cb823ef51a31bfc2809d5cb25264d42685a24dafdb6d
-SIZE (bareos-bareos-Release-22.1.4_GH0.tar.gz) = 14747141
+TIMESTAMP = 1734848781
+SHA256 (bareos-bareos-Release-22.1.6_GH0.tar.gz) = 7ab1547d08a4fb6b1d97b5fae4f62ff1437230ffaa8a3223605fe8e27e2bfb2a
+SIZE (bareos-bareos-Release-22.1.6_GH0.tar.gz) = 14758055
diff --git a/www/bareos22-webui/Makefile b/www/bareos22-webui/Makefile
index ced73c924ee9..008808e5220b 100644
--- a/www/bareos22-webui/Makefile
+++ b/www/bareos22-webui/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	22.1.4
+DISTVERSION=	22.1.6
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	22-webui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PHP-Frontend to manage Bareos over the web
 WWW=		https://www.bareos.org/
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
 
 USES=		cpe php:build cmake gettext
 USE_PHP=	gettext ctype session iconv
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/webui
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}
 CMAKE_ARGS+=	-DSHARE_INSTALL_PREFIX:PATH=${PREFIX}/www \
 		-DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=${PREFIX}/etc \
 		-Dsysconfdir=${PREFIX}/etc \
 		-Dwebuiconfdir=${PREFIX}/${ETCDIRWEBUI} \
 		-DVERSION_STRING=${DISTVERSION} \
 		-DBAREOS_FULL_VERSION:STRING=${DISTVERSION}
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI}
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI}
 
 OPTIONS_DEFINE=		PGSQL
 OPTIONS_DEFAULT=	PGSQL
 
 PGSQL_USE=		PHP=pdo_pgsql
 
 ETCDIRWEBUI=		etc/${PORTNAME}${PKGNAMESUFFIX}
 
 post-extract:
 	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
 pre-install:
 	${FIND} ${WRKSRC}/webui -name *.in -delete
 
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
 	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config module public vendor" \
 		${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/directors.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/configuration.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-readonly.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-readonly.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>
diff --git a/www/bareos22-webui/distinfo b/www/bareos22-webui/distinfo
index 1de1847a5575..b602564f1f06 100644
--- a/www/bareos22-webui/distinfo
+++ b/www/bareos22-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714631970
-SHA256 (bareos-bareos-Release-22.1.4_GH0.tar.gz) = fd2d2eb7557907e1fe85cb823ef51a31bfc2809d5cb25264d42685a24dafdb6d
-SIZE (bareos-bareos-Release-22.1.4_GH0.tar.gz) = 14747141
+TIMESTAMP = 1734848741
+SHA256 (bareos-bareos-Release-22.1.6_GH0.tar.gz) = 7ab1547d08a4fb6b1d97b5fae4f62ff1437230ffaa8a3223605fe8e27e2bfb2a
+SIZE (bareos-bareos-Release-22.1.6_GH0.tar.gz) = 14758055