diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile
index 20926ab58..b2a72d486 100644
--- a/multimedia/gerbera/Makefile
+++ b/multimedia/gerbera/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -19,8 +19,9 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE.md
 
-PKG_BUILD_DEPENDS:=taglib
+PKG_BUILD_DEPENDS:=libmatroska taglib
 PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:=CONFIG_BUILD_PATENTED
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -29,7 +30,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/gerbera
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+file +libupnp +libsqlite3 +libexif +libexpat +libuuid +libstdcpp $(ICONV_DEPENDS)
+  DEPENDS:=+file +libupnp +libsqlite3 +libexif +libexpat +libuuid +BUILD_PATENTED:libffmpeg +libstdcpp $(ICONV_DEPENDS)
   TITLE:=A free media server
   URL:=https://gerbera.io
   USERID:=gerbera:gerbera
@@ -52,11 +53,11 @@ CMAKE_OPTIONS += \
 	-DWITH_INOTIFY=1 \
 	-DWITH_JS=0 \
 	-DWITH_TAGLIB=1 \
-	-DWITH_AVCODEC=0 \
+	-DWITH_AVCODEC=$(if $(CONFIG_BUILD_PATENTED),ON,OFF) \
 	-DWITH_FFMPEGTHUMBNAILER=0 \
 	-DWITH_EXIF=1 \
 	-DWITH_EXIV2=0 \
-	-DWITH_MATROSKA=0 \
+	-DWITH_MATROSKA=1 \
 	-DWITH_SYSTEMD=0 \
 	-DWITH_LASTFM=0 \
 	-DWITH_DEBUG=0 \
diff --git a/multimedia/gerbera/patches/010-ebml.patch b/multimedia/gerbera/patches/010-ebml.patch
new file mode 100644
index 000000000..619a33443
--- /dev/null
+++ b/multimedia/gerbera/patches/010-ebml.patch
@@ -0,0 +1,35 @@
+From aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 24 Dec 2019 22:57:18 +0100
+Subject: [PATCH] cmake/FindMatroska: fix static linking
+
+Fix static linking with libmatrasoka by adding PC_EBM_LIBRARIES to
+EBML_LIBRARIES and PC_MAT_LIBRARIES to MATROSKA_LIBRARIES
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ cmake/FindMatroska.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindMatroska.cmake b/cmake/FindMatroska.cmake
+index 4b09a5ec..12ca593d 100644
+--- a/cmake/FindMatroska.cmake
++++ b/cmake/FindMatroska.cmake
+@@ -23,7 +23,7 @@ FIND_LIBRARY(EBML_LIBRARY ebml
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(EBML
+     REQUIRED_VARS EBML_LIBRARY EBML_INCLUDE_DIR)
+ if (EBML_FOUND)
+-    set (EBML_LIBRARIES ${EBML_LIBRARY})
++    set (EBML_LIBRARIES ${EBML_LIBRARY} ${PC_EBM_LIBRARIES})
+     set (EBML_INCLUDE_DIRS ${EBML_INCLUDE_DIR} )
+ endif ()
+ MARK_AS_ADVANCED(
+@@ -41,7 +41,7 @@ find_library(MATROSKA_LIBRARY matroska
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATROSKA
+     REQUIRED_VARS MATROSKA_LIBRARY MATROSKA_INCLUDE_DIR)
+ if (MATROSKA_FOUND)
+-    set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY})
++    set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY} ${PC_MAT_LIBRARIES})
+     set (MATROSKA_INCLUDE_DIRS ${MATROSKA_INCLUDE_DIR} )
+ endif ()
+ MARK_AS_ADVANCED(
diff --git a/multimedia/gerbera/patches/020-ebml.patch b/multimedia/gerbera/patches/020-ebml.patch
new file mode 100644
index 000000000..3ef75a4a9
--- /dev/null
+++ b/multimedia/gerbera/patches/020-ebml.patch
@@ -0,0 +1,26 @@
+From f53b80b6b1ede5b89e38219454e0411ee67a9b4b Mon Sep 17 00:00:00 2001
+From: david <16252944+astylos@users.noreply.github.com>
+Date: Thu, 27 Feb 2020 22:54:40 +0000
+Subject: [PATCH] switch order of mastroska and ebml to fix linking issue
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index feffa637..62e43650 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -543,10 +543,10 @@ endif()
+ if(WITH_MATROSKA)
+     find_package (Matroska)
+     if (MATROSKA_FOUND AND EBML_FOUND)
+-        include_directories(${EBML_INCLUDE_DIRS})
+-        target_link_libraries (gerbera ${EBML_LIBRARIES})
+         include_directories(${MATROSKA_INCLUDE_DIRS})
+         target_link_libraries (gerbera ${MATROSKA_LIBRARIES})
++        include_directories(${EBML_INCLUDE_DIRS})
++        target_link_libraries (gerbera ${EBML_LIBRARIES})
+         add_definitions(-DHAVE_MATROSKA)
+     else()
+         message(FATAL_ERROR "Matroska not found")