diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index b3304059253d..c829a27d2534 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,94 +1,94 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.1
+DISTVERSION=	1.8.2
 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 61641477d3cc..f264d1ba742e 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620856841
-SHA256 (gerbera-gerbera-v1.8.1_GH0.tar.gz) = 66f49ee30e53c36e08ce56a724f84bde8350001d3b9309f8e62a34f38446b619
-SIZE (gerbera-gerbera-v1.8.1_GH0.tar.gz) = 3585872
+TIMESTAMP = 1622501317
+SHA256 (gerbera-gerbera-v1.8.2_GH0.tar.gz) = b1e5591515f05a46de052ef4d95a2bb3387e96f565a5ce7abb6a77dbe581f09a
+SIZE (gerbera-gerbera-v1.8.2_GH0.tar.gz) = 3589779
diff --git a/net/gerbera/files/patch-CMakeLists.txt b/net/gerbera/files/patch-CMakeLists.txt
index 926f090af3a6..ef7d23dd3515 100644
--- a/net/gerbera/files/patch-CMakeLists.txt
+++ b/net/gerbera/files/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2021-03-07 21:18:59 UTC
+--- CMakeLists.txt.orig	2021-05-31 22:55:03 UTC
 +++ CMakeLists.txt
-@@ -559,6 +559,6 @@ INSTALL(FILES
+@@ -592,6 +592,6 @@ INSTALL(FILES
          src/database/mysql/mysql.sql
          src/database/sqlite3/sqlite3.sql
          DESTINATION share/gerbera)
 -INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION share/man/man1)
 +INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION man/man1)
  
  include(packaging)
diff --git a/net/gerbera/files/patch-test_core_test__server.cc b/net/gerbera/files/patch-test_core_test__server.cc
deleted file mode 100644
index 2d1eadbc156b..000000000000
--- a/net/gerbera/files/patch-test_core_test__server.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/core/test_server.cc.orig	2020-07-27 06:07:30 UTC
-+++ test/core/test_server.cc
-@@ -51,17 +51,6 @@ TEST_F(ServerTest, ServerOutputsHelpInformation)
-     ASSERT_THAT(output.c_str(), HasSubstr(expectedOutput.c_str()));
- }
- 
--TEST_F(ServerTest, ServerOutputsCompileInformationIncludingGit)
--{
--    fs::path cmd = fs::path(CMAKE_BINARY_DIR) / "gerbera --compile-info 2>&1";
--    std::string output = exec(cmd.c_str());
--
--    ASSERT_THAT(output, HasSubstr("Compile info\n-------------\nWITH_"));
--    ASSERT_THAT(output, HasSubstr("Git info:\n-------------\n"));
--    ASSERT_THAT(output, HasSubstr("Git Branch: "));
--    ASSERT_THAT(output, HasSubstr("Git Commit: "));
--}
--
- TEST_F(ServerTest, GeneratesFullConfigFromServerCommand)
- {
-     // simple check to ensure complete generation from server