diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index c95c95384507..f39e25400ce7 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
+DISTVERSION=	2.5.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_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
 
 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 acea7d1435ff..cacc5e1c0754 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736302546
-SHA256 (gerbera-gerbera-v2.4.1_GH0.tar.gz) = 563ee3941b0347a91f5a3e9fe151032bd0e26868bfe7b7c68a7c095f8b07677b
-SIZE (gerbera-gerbera-v2.4.1_GH0.tar.gz) = 9594796
+TIMESTAMP = 1741381325
+SHA256 (gerbera-gerbera-v2.5.0_GH0.tar.gz) = e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
+SIZE (gerbera-gerbera-v2.5.0_GH0.tar.gz) = 9873077
diff --git a/net/gerbera/files/patch-CMakeLists.txt b/net/gerbera/files/patch-CMakeLists.txt
deleted file mode 100644
index a77cc1742047..000000000000
--- a/net/gerbera/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2025-01-08 02:28:56 UTC
-+++ CMakeLists.txt
-@@ -25,7 +25,7 @@ cmake_policy(VERSION 3.13)
- 
- # Only set for release tags
- # You should only see version "git" when built from a git snapshot tarball
--set(GERBERA_VERSION "2.4.0")
-+set(GERBERA_VERSION "2.4.1")
- 
- project(Gerbera
-         DESCRIPTION "UPnP Media Server"