diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile
new file mode 100644
index 0000000000..69213f4b06
--- /dev/null
+++ b/libs/taglib/Makefile
@@ -0,0 +1,56 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=taglib
+PKG_VERSION:=1.11.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/taglib/taglib/releases/download/v$(PKG_VERSION)
+PKG_HASH:=b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING.LGPL
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/taglib
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=taglib
+  URL:=https://github.com/taglib/taglib
+  DEPENDS:=+libstdcpp
+  BUILDONLY:=1
+endef
+
+define Package/taglib/description
+  TagLib is a library for reading and editing the metadata of several
+  popular audio formats. Currently it supports both ID3v1 and ID3v2 for
+  MP3 files, Ogg Vorbis comments and ID3 tags in FLAC, MPC, Speex, WavPack,
+  TrueAudio, WAV, AIFF, MP4, APE, DSF, DFF, and ASF files.
+endef
+
+CMAKE_OPTIONS += \
+	-DHAVE_BOOST_BYTESWAP=OFF \
+	-DBUILD_TESTS=OFF \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_BINDINGS=OFF \
+	-DNO_ITUNES_HACKS=ON
+
+TARGET_CXXFLAGS += -flto
+
+define Build/InstallDev
+	$(call Build/InstallDev/cmake,$(1))
+	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/taglib.pc
+	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/taglib.pc
+endef
+
+$(eval $(call BuildPackage,taglib))
diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile
index e7cecadf18..54163667b1 100644
--- a/multimedia/gerbera/Makefile
+++ b/multimedia/gerbera/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -19,7 +19,7 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE.md
 
-PKG_BUILD_DEPENDS:=libmatroska pugixml spdlog
+PKG_BUILD_DEPENDS:=libmatroska pugixml spdlog taglib
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -53,7 +53,7 @@ CMAKE_OPTIONS += \
 	-DWITH_CURL=OFF \
 	-DWITH_INOTIFY=ON \
 	-DWITH_JS=OFF \
-	-DWITH_TAGLIB=OFF \
+	-DWITH_TAGLIB=ON \
 	-DWITH_AVCODEC=OFF \
 	-DWITH_FFMPEGTHUMBNAILER=OFF \
 	-DWITH_EXIF=ON \