diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 9b996093473f..d723a93a6845 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,95 +1,94 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.2
-PORTREVISION=	1
+DISTVERSION=	1.9.0
 CATEGORIES=	net multimedia
 
 MAINTAINER=	daniel.engberg.lists@pyret.net
 COMMENT=	Media server compatible with DLNA and UPnP
 
 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
 
 CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
 
 TEST_TARGET=	test
 
 SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 USERS=		gerbera
 GROUPS=		gerbera
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			LIBMAGIC MATROSKA TAGLIB TEST
 OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG LIBMAGIC 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
 LIBMAGIC_DESC=		Identify file mime types via libmagic
 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
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
 
 LIBMAGIC_LIB_DEPENDS=	libmagic.so:sysutils/file
 LIBMAGIC_CMAKE_BOOL=	WITH_MAGIC
 
 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
 
 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 f264d1ba742e..a9012cbf24c6 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622501317
-SHA256 (gerbera-gerbera-v1.8.2_GH0.tar.gz) = b1e5591515f05a46de052ef4d95a2bb3387e96f565a5ce7abb6a77dbe581f09a
-SIZE (gerbera-gerbera-v1.8.2_GH0.tar.gz) = 3589779
+TIMESTAMP = 1627825872
+SHA256 (gerbera-gerbera-v1.9.0_GH0.tar.gz) = 7d3af525a6c37e10869961b2fedc2cfb54d8acf30256a2d5a10394c6a97ed25b
+SIZE (gerbera-gerbera-v1.9.0_GH0.tar.gz) = 3663737
diff --git a/net/gerbera/pkg-plist b/net/gerbera/pkg-plist
index c75f60ca5e26..4c41161e63dd 100644
--- a/net/gerbera/pkg-plist
+++ b/net/gerbera/pkg-plist
@@ -1,87 +1,89 @@
 bin/gerbera
 %%DATADIR%%/js/common.js
 %%DATADIR%%/js/import.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/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/js/md5.js
 %%DATADIR%%/web/mr_reg.xml
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css.map
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css.map
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css.map
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css.map
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css.map
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css
 %%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css.map
 %%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js
 %%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js.map
 %%DATADIR%%/web/vendor/bootstrap/js/bootstrap.min.js
 %%DATADIR%%/web/vendor/bootstrap/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.5.1.min.js
 %%DATADIR%%/web/vendor/jquery/jquery-ui.min.js
 %%DATADIR%%/web/vendor/js-cookie.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/popper/popper.js
 %%DATADIR%%/web/vendor/tether/tether.min.js
 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