diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 56653f79a8ef..37e677395a0c 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,96 +1,99 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.1
-PORTREVISION=	1
+DISTVERSION=	3.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
 
+BUILD_DEPENDS=	cxxopts>0:devel/cxxopts
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libicui18n.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libspdlog.so:devel/spdlog \
-		libpugixml.so:textproc/pugixml \
-		libinotify.so:devel/libinotify
+		libpugixml.so:textproc/pugixml
 
 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 WITH_ZIP
+CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MATROSKA WITH_MYSQL WITH_SYSTEMD \
+		WITH_ZIP
 CMAKE_ON=	WITH_MAGIC
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
-			MATROSKA TAGLIB TEST
+			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_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=	libebml.so:textproc/libebml \
-			libmatroska.so:multimedia/libmatroska
-MATROSKA_CMAKE_BOOL=	WITH_MATROSKA
-
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_CMAKE_BOOL=	WITH_TESTS
 TEST_TEST_TARGET=	test
 TEST_IMPLIES=		CURL DUKTAPE
 TEST_ENV=		LC_ALL=C.UTF-8 CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER}
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500050
+LIB_DEPENDS+=	libinotify.so:devel/libinotify
+.else
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-FreeBSD-15-inotify
+.endif
+
 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 75386346364c..6dc06cfea6b4 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1768854253
-SHA256 (gerbera-gerbera-v3.1.1_GH0.tar.gz) = 0556a6dc17da2043d88bee934c43a7475403da920a9b07a12fb48ac6dfc58ea3
-SIZE (gerbera-gerbera-v3.1.1_GH0.tar.gz) = 9959135
+TIMESTAMP = 1773495520
+SHA256 (gerbera-gerbera-v3.2.0_GH0.tar.gz) = c55ec5cddc952e2563586ac76014be072c9dedb5094c6675889afa90b8df23e2
+SIZE (gerbera-gerbera-v3.2.0_GH0.tar.gz) = 10058527
diff --git a/net/gerbera/files/extra-patch-FreeBSD-15-inotify b/net/gerbera/files/extra-patch-FreeBSD-15-inotify
new file mode 100644
index 000000000000..20b56674c223
--- /dev/null
+++ b/net/gerbera/files/extra-patch-FreeBSD-15-inotify
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2026-03-14 13:58:28 UTC
++++ CMakeLists.txt
+@@ -666,8 +666,8 @@ if(WITH_INOTIFY)
+ endif()
+ 
+ if(WITH_INOTIFY)
+-    find_package(Inotify REQUIRED)
+-    target_link_libraries(libgerbera PUBLIC Inotify::Inotify)
++#    find_package(Inotify REQUIRED)
++#    target_link_libraries(libgerbera PUBLIC Inotify::Inotify)
+     target_compile_definitions(libgerbera PUBLIC HAVE_INOTIFY)
+ endif()
+