diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 92ab7d88515d..f2963f732cbd 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,92 +1,91 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
-PORTREVISION=	1
+DISTVERSION=	2.2.0
 CATEGORIES=	net multimedia
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Media server compatible with DLNA and UPnP
 WWW=		https://gerbera.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog \
 		libpugixml.so:textproc/pugixml \
 		libinotify.so:devel/libinotify
 
 USES=		cmake compiler:c++17-lang iconv localbase:ldflags \
 		pkgconfig sqlite
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	gerbera
 
 USERS=		gerbera
 GROUPS=		gerbera
 
 SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
 CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
 CMAKE_ON=	WITH_MAGIC
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			MATROSKA TAGLIB TEST
 OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG TAGLIB LIBNPUPNP
 
 OPTIONS_SINGLE=		UPNPLIB
 OPTIONS_SINGLE_UPNPLIB=	LIBNPUPNP LIBUPNP
 
 CURL_DESC=		Support for online services via cURL
 DUKTAPE_DESC=		Javascript support for custom import scripts
 FFMPEGTHUMBNAILER_DESC=	Support for thumbnail generation
 LIBNPUPNP_DESC=		Use high performance libnpupnp library
 LIBUPNP_DESC=		Use libupnp library
 MATROSKA_DESC=		Extract video/mkv metadata via libmatroska
 TAGLIB_DESC=		Extract audio file metadata via taglib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	WITH_CURL
 
 DEBUG_CMAKE_BOOL=	WITH_DEBUG
 
 DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
 DUKTAPE_CMAKE_BOOL=	WITH_JS
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CMAKE_BOOL=	WITH_EXIV2
 
-FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
+FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
 
 LIBNPUPNP_LIB_DEPENDS=	libnpupnp.so:net/libnpupnp
 LIBNPUPNP_CMAKE_BOOL=	WITH_NPUPNP
 
 LIBUPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
 MATROSKA_CMAKE_BOOL=	WITH_MATROSKA
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
-TEST_IMPLIES=		CURL DUKTAPE
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_CMAKE_BOOL=	WITH_TESTS
 TEST_TEST_TARGET=	test
+TEST_IMPLIES=		CURL DUKTAPE
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
 	@${MKDIR} ${STAGEDIR}/var/db/gerbera
 	@${MKDIR} ${STAGEDIR}/var/log/gerbera
 	@${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample
 
 .include <bsd.port.mk>
diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo
index 1ee35e02be70..d7ca4f90b144 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714211035
-SHA256 (gerbera-gerbera-v2.1.0_GH0.tar.gz) = 50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
-SIZE (gerbera-gerbera-v2.1.0_GH0.tar.gz) = 5828980
+TIMESTAMP = 1720336836
+SHA256 (gerbera-gerbera-v2.2.0_GH0.tar.gz) = c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
+SIZE (gerbera-gerbera-v2.2.0_GH0.tar.gz) = 6138157
diff --git a/net/gerbera/pkg-plist b/net/gerbera/pkg-plist
index b924fc0c7640..4775eec05bfc 100644
--- a/net/gerbera/pkg-plist
+++ b/net/gerbera/pkg-plist
@@ -1,87 +1,88 @@
 bin/gerbera
 %%DATADIR%%/js/audio.js
 %%DATADIR%%/js/common.js
 %%DATADIR%%/js/import.js
 %%DATADIR%%/js/metadata.js
 %%DATADIR%%/js/playlists.js
 %%DATADIR%%/mysql-upgrade.xml
 %%DATADIR%%/mysql.sql
 %%DATADIR%%/sqlite3-upgrade.xml
 %%DATADIR%%/sqlite3.sql
 %%DATADIR%%/web/README.md
 %%DATADIR%%/web/assets/theme/colors.css
 %%DATADIR%%/web/assets/theme/gerbera-logo-white.png
 %%DATADIR%%/web/assets/theme/gerbera.css
-%%DATADIR%%/web/cds.xml
-%%DATADIR%%/web/cm.xml
+%%DATADIR%%/web/assets/theme/home-bg.jpg
 %%DATADIR%%/web/disabled.html
 %%DATADIR%%/web/favicon.ico
 %%DATADIR%%/web/gerbera-config-expert.json
 %%DATADIR%%/web/gerbera-config-minimal.json
 %%DATADIR%%/web/gerbera-config-standard.json
 %%DATADIR%%/web/icons/mt-icon120.bmp
 %%DATADIR%%/web/icons/mt-icon120.jpg
 %%DATADIR%%/web/icons/mt-icon120.png
 %%DATADIR%%/web/icons/mt-icon32.bmp
 %%DATADIR%%/web/icons/mt-icon32.jpg
 %%DATADIR%%/web/icons/mt-icon32.png
 %%DATADIR%%/web/icons/mt-icon48.bmp
 %%DATADIR%%/web/icons/mt-icon48.jpg
 %%DATADIR%%/web/icons/mt-icon48.png
 %%DATADIR%%/web/index.html
 %%DATADIR%%/web/js/gerbera-app.module.js
 %%DATADIR%%/web/js/gerbera-auth.module.js
 %%DATADIR%%/web/js/gerbera-autoscan.module.js
 %%DATADIR%%/web/js/gerbera-clients.module.js
 %%DATADIR%%/web/js/gerbera-config.module.js
 %%DATADIR%%/web/js/gerbera-items.module.js
 %%DATADIR%%/web/js/gerbera-menu.module.js
 %%DATADIR%%/web/js/gerbera-trail.module.js
 %%DATADIR%%/web/js/gerbera-tree.module.js
 %%DATADIR%%/web/js/gerbera-tweak.module.js
 %%DATADIR%%/web/js/gerbera-updates.module.js
 %%DATADIR%%/web/js/jquery.gerbera.autoscan.js
 %%DATADIR%%/web/js/jquery.gerbera.clients.js
 %%DATADIR%%/web/js/jquery.gerbera.config.js
 %%DATADIR%%/web/js/jquery.gerbera.editor.js
 %%DATADIR%%/web/js/jquery.gerbera.items.js
 %%DATADIR%%/web/js/jquery.gerbera.toast.js
 %%DATADIR%%/web/js/jquery.gerbera.trail.js
 %%DATADIR%%/web/js/jquery.gerbera.tree.js
 %%DATADIR%%/web/js/jquery.gerbera.tweak.js
-%%DATADIR%%/web/mr_reg.xml
+%%DATADIR%%/web/upnp/cds.xml
+%%DATADIR%%/web/upnp/cm.xml
+%%DATADIR%%/web/upnp/mr_reg.xml
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-grid.min.css
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-grid.min.css.map
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-reboot.min.css
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-reboot.min.css.map
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap.min.css
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap.min.css.map
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/js/bootstrap.min.js
 %%DATADIR%%/web/vendor/bootstrap-4.6.2/js/bootstrap.min.js.map
 %%DATADIR%%/web/vendor/font-awesome/css/font-awesome.css
 %%DATADIR%%/web/vendor/font-awesome/css/font-awesome.min.css
 %%DATADIR%%/web/vendor/font-awesome/fonts/FontAwesome.otf
 %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.eot
 %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.svg
 %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.ttf
 %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff
 %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff2
 %%DATADIR%%/web/vendor/jquery/jquery-3.7.1.min.js
 %%DATADIR%%/web/vendor/jquery/jquery-3.7.1.min.map
 %%DATADIR%%/web/vendor/jquery/jquery-ui.min.js
 %%DATADIR%%/web/vendor/js-cookie.min.js
 %%DATADIR%%/web/vendor/lato/LICENCE.md
 %%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff
 %%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff2
 %%DATADIR%%/web/vendor/md5.min.js
 %%DATADIR%%/web/vendor/md5.min.js.map
 %%DATADIR%%/web/vendor/popper/popper.min.js
 %%DATADIR%%/web/vendor/popper/popper.min.js.map
 %%DATADIR%%/web/vendor/tether/tether-2.0.0.min.css
 %%DATADIR%%/web/vendor/tether/tether-2.0.0.min.js
 share/man/man1/gerbera.1.gz
 @owner %%USER%%
 @group %%GROUP%%
 @dir /var/db/gerbera
 @dir /var/log/gerbera
 @sample(gerbera,gerbera,0640) /usr/local/etc/gerbera-config.xml.sample