diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.recipe b/media-video/ffmpeg/ffmpeg-3.3.4.recipe
index 5ec72e5f8..5bfab1881 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2017 the FFmpeg developers"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
 CHECKSUM_SHA256="98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957"
 PATCHES="ffmpeg-$portVersion.patchset"
@@ -35,6 +35,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
+	lib:libopus$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
 	lib:libmodplug$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
@@ -75,6 +76,7 @@ BUILD_REQUIRES="
 	devel:libbz2$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
+	devel:libopus$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
@@ -126,9 +128,10 @@ BUILD()
 		--disable-debug \
 		--enable-shared \
 		--enable-libmodplug \
-		--enable-libvorbis \
+		--enable-libopus \
 		--enable-libspeex \
 		--enable-libtheora \
+		--enable-libvorbis \
 		--enable-libvpx \
 		--enable-gpl \
 		--enable-avresample
diff --git a/media-video/ffmpeg/ffmpeg-3.4.recipe b/media-video/ffmpeg/ffmpeg-3.4.recipe
index ae004b2f2..20af004cf 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.4.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2017 the FFmpeg developers"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
 CHECKSUM_SHA256="aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef"
 PATCHES="ffmpeg-$portVersion.patchset"
@@ -17,13 +17,9 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" #do we really need !x86_gcc2 in here?
 
 PROVIDES="
 	ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.2
-	cmd:ffmpeg = $portVersion compat >= 3.2
-	cmd:ffprobe = $portVersion compat >= 3.2
-	cmd:ffserver = $portVersion compat >= 3.2
 	lib:libavutil$secondaryArchSuffix = 55.78.100 compat >= 55
 	lib:libavcodec$secondaryArchSuffix = 57.107.100 compat >= 57
 	lib:libavformat$secondaryArchSuffix = 57.83.100 compat >= 57
-	lib:libavdevice$secondaryArchSuffix = 57.10.100 compat >= 57
 	lib:libavfilter$secondaryArchSuffix = 6.107.100 compat >= 6
 	lib:libavresample$secondaryArchSuffix = 3.7.0 compat >= 3
 	lib:libswscale$secondaryArchSuffix = 4.8.100 compat >= 4
@@ -49,6 +45,37 @@ CONFLICTS="
 	ffmpeg2${secondaryArchSuffix}_bin
 	"
 
+PROVIDES_avdevice="
+	ffmpeg${secondaryArchSuffix}_avdevice = $portVersion compat >= 3.2
+	lib:libavdevice$secondaryArchSuffix = 57.10.100 compat >= 57
+"
+
+REQUIRES_avdevice="
+	haiku$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix == 57.107.100
+	lib:libavfilter$secondaryArchSuffix == 6.107.100
+	lib:libavformat$secondaryArchSuffix == 57.83.100
+	lib:libavutil$secondaryArchSuffix == 55.78.100
+"
+
+PROVIDES_tools="
+	ffmpeg${secondaryArchSuffix}_ffplay = $portVersion
+	cmd:ffplay = $portVersion compat >= 3.2
+	cmd:ffmpeg = $portVersion compat >= 3.2
+	cmd:ffprobe = $portVersion compat >= 3.2
+	cmd:ffserver = $portVersion compat >= 3.2
+"
+REQUIRES_tools="
+	haiku$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix == 57.107.100
+	lib:libavdevice$secondaryArchSuffix == 57.10.100
+	lib:libavfilter$secondaryArchSuffix == 6.107.100
+	lib:libavformat$secondaryArchSuffix == 57.83.100
+	lib:libavutil$secondaryArchSuffix == 55.78.100
+"
+
 PROVIDES_devel="
 	ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 3.2
 	devel:libavutil$secondaryArchSuffix = 55.78.100 compat >= 55
@@ -75,6 +102,7 @@ BUILD_REQUIRES="
 	devel:libbz2$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
+	devel:libsdl2$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
@@ -171,6 +199,10 @@ INSTALL()
 	mv $prefix/share/doc/ffmpeg $docDir
 	rm -r $prefix/share
 
+	# Split out libs and executables which need libSDL
+	packageEntries tools $prefix/bin
+	packageEntries avdevice $libDir/libavdevice*
+
 	# devel package
 	packageEntries devel \
 		$dataDir/ffmpeg$secondaryArchSuffix/examples \