diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
new file mode 100644
index 0000000000000..ff5f6075ec105
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
@@ -0,0 +1,14 @@
+diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
+index 2fade4a9..de33617b 100644
+--- gerbera/src/file_request_handler.cc
++++ gerbera/src/file_request_handler.cc
+@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
+                     header = header + "CaptionInfo.sec: " + url;
+                 }
+             }
+-#endif
+         }
++#endif
+     }
+ 
+     if (!string_ok(mimeType))
diff --git a/net-misc/gerbera/gerbera-1.1.0.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
similarity index 82%
rename from net-misc/gerbera/gerbera-1.1.0.ebuild
rename to net-misc/gerbera/gerbera-1.1.0-r1.ebuild
index 86fe0131d520f..f9521cc5691e0 100644
--- a/net-misc/gerbera/gerbera-1.1.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
@@ -17,11 +17,11 @@ else
 fi
 
 DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
 		libav? ( >=media-video/libav-10:0= )
 		!libav? ( >=media-video/ffmpeg-2.2:0= )
 	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	curl? ( net-misc/curl net-misc/youtube-dl )
 	magic? ( sys-apps/file )
 	sys-apps/util-linux
@@ -47,6 +48,8 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
+PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
+
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -61,12 +64,15 @@ src_configure() {
 		-DWITH_DEBUG_LOGGING="$(usex debug)" \
 		-DWITH_EXIF="$(usex exif)" \
 		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
 		-DWITH_JS="$(usex javascript)" \
 		-DWITH_LASTFM="$(usex lastfm)" \
 		-DWITH_MAGIC="$(usex magic)" \
 		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
 		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)"
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
 	)
 
 	cmake-utils_src_configure
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 86fe0131d520f..7f6f95dd5c367 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -17,11 +17,11 @@ else
 fi
 
 DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
 		libav? ( >=media-video/libav-10:0= )
 		!libav? ( >=media-video/ffmpeg-2.2:0= )
 	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	curl? ( net-misc/curl net-misc/youtube-dl )
 	magic? ( sys-apps/file )
 	sys-apps/util-linux
@@ -61,12 +62,15 @@ src_configure() {
 		-DWITH_DEBUG_LOGGING="$(usex debug)" \
 		-DWITH_EXIF="$(usex exif)" \
 		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
 		-DWITH_JS="$(usex javascript)" \
 		-DWITH_LASTFM="$(usex lastfm)" \
 		-DWITH_MAGIC="$(usex magic)" \
 		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
 		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)"
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
 	)
 
 	cmake-utils_src_configure
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index e244367f765e3..1c5747db8ebf3 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -8,9 +8,11 @@
   <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
   <use>
     <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
     <flag name="lastfm">Enable last.fm support</flag>
     <flag name="magic">Use libmagic to determine file types</flag>
     <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+    <flag name="protocol-extensions">Enable partial DLNA support</flag>
     <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
   </use>
   <upstream>