diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 37e677395a0c..bb194e8d76dc 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,99 +1,101 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.0
+DISTVERSION=	3.2.1
 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
 
+BROKEN_i386=	error: non-constant-expression cannot be narrowed from type 'rep' (aka 'long long') to 'time_t' (aka 'int') in initializer list
+
 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
 
 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_MATROSKA WITH_MYSQL WITH_SYSTEMD \
 		WITH_ZIP
 CMAKE_ON=	WITH_MAGIC
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			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
 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
 
 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 6dc06cfea6b4..eac757f978bd 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773495520
-SHA256 (gerbera-gerbera-v3.2.0_GH0.tar.gz) = c55ec5cddc952e2563586ac76014be072c9dedb5094c6675889afa90b8df23e2
-SIZE (gerbera-gerbera-v3.2.0_GH0.tar.gz) = 10058527
+TIMESTAMP = 1774165590
+SHA256 (gerbera-gerbera-v3.2.1_GH0.tar.gz) = 6b89d0c416b6d98e34634e5b1121f340315d60b088e9e6b2fca423488760030f
+SIZE (gerbera-gerbera-v3.2.1_GH0.tar.gz) = 10059938
diff --git a/net/gerbera/files/patch-CMakeLists.txt b/net/gerbera/files/patch-CMakeLists.txt
index 1e64031e42fd..262ddf87dba6 100644
--- a/net/gerbera/files/patch-CMakeLists.txt
+++ b/net/gerbera/files/patch-CMakeLists.txt
@@ -1,27 +1,25 @@
---- CMakeLists.txt.orig	2025-11-08 19:08:45 UTC
+--- CMakeLists.txt.orig	2026-03-22 07:47:15 UTC
 +++ CMakeLists.txt
-@@ -906,15 +906,15 @@ endif()
-     )
+@@ -951,14 +951,14 @@ endif()
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
  endif()
  
 -if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 -    set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions")
 -
--    install(FILES
--            scripts/gerbera-completion.sh
--            DESTINATION "${BASH_COMPLETION_DIR}"
--            RENAME gerbera
--    )
+-    install(
+-        FILES scripts/gerbera-completion.sh
+-        DESTINATION "${BASH_COMPLETION_DIR}"
+-        RENAME gerbera)
 -endif()
 +#if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 +#    set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions")
 +#
-+#    install(FILES
-+#            scripts/gerbera-completion.sh
-+#            DESTINATION "${BASH_COMPLETION_DIR}"
-+#            RENAME gerbera
-+#    )
++#    install(
++#        FILES scripts/gerbera-completion.sh
++#        DESTINATION "${BASH_COMPLETION_DIR}"
++#        RENAME gerbera)
 +#endif()
  
  set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${DEBIAN_EXTRA_FILES})