diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.recipe b/media-video/ffmpeg/ffmpeg-3.3.6.recipe
similarity index 56%
rename from media-video/ffmpeg/ffmpeg-3.3.4.recipe
rename to media-video/ffmpeg/ffmpeg-3.3.6.recipe
index 5bfab1881..6acb06d25 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.recipe
@@ -7,28 +7,54 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2017 the FFmpeg developers"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
-CHECKSUM_SHA256="98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957"
+CHECKSUM_SHA256="d2fb2223532ab15f1b51765a8665c396feebf81f7e77775e2f4c323c8d1b8906"
 PATCHES="ffmpeg-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+ffmpegLibs="\
+	libavcodec \
+	libavdevice \
+	libavfilter \
+	libavformat \
+	libavresample \
+	libavutil \
+	libpostproc \
+	libswresample \
+	libswscale \
+	"
+# Do not sort alphabetically
+libavutilVersion="55.58.100"
+libavcodecVersion="57.89.100"
+libavformatVersion="57.71.100"
+libavdeviceVersion="57.6.100"
+libavfilterVersion="6.82.100"
+libavresampleVersion="3.5.0"
+libswscaleVersion="4.6.100"
+libswresampleVersion="2.7.100"
+libpostprocVersion="54.5.100"
+portVersionCompat="$portVersion compat >= 3.2"
+for i in $ffmpegLibs; do
+	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
+done
 
 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.58.100 compat >= 55
-	lib:libavcodec$secondaryArchSuffix = 57.89.100 compat >= 57
-	lib:libavformat$secondaryArchSuffix = 57.71.100 compat >= 57
-	lib:libavdevice$secondaryArchSuffix = 57.6.100 compat >= 57
-	lib:libavfilter$secondaryArchSuffix = 6.82.100 compat >= 6
-	lib:libavresample$secondaryArchSuffix = 3.5.0 compat >= 3
-	lib:libswscale$secondaryArchSuffix = 4.6.100 compat >= 4
-	lib:libswresample$secondaryArchSuffix = 2.7.100 compat >= 2
-	lib:libpostproc$secondaryArchSuffix = 54.5.100 compat >= 54
+	ffmpeg$secondaryArchSuffix = $portVersionCompat
+	cmd:ffmpeg = $portVersionCompat
+	cmd:ffprobe = $portVersionCompat
+	cmd:ffserver = $portVersionCompat
+	lib:libavutil$secondaryArchSuffix = $libavutilVersionCompat
+	lib:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
+	lib:libavformat$secondaryArchSuffix = $libavformatVersionCompat
+	lib:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
+	lib:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
+	lib:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
+	lib:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
+	lib:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
+	lib:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
 	"
 
 REQUIRES="
@@ -51,16 +77,16 @@ CONFLICTS="
 	"
 
 PROVIDES_devel="
-	ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 3.2
-	devel:libavutil$secondaryArchSuffix = 55.58.100 compat >= 55
-	devel:libavcodec$secondaryArchSuffix = 57.89.100 compat >= 57
-	devel:libavformat$secondaryArchSuffix = 57.71.100 compat >= 57
-	devel:libavdevice$secondaryArchSuffix = 57.6.100 compat >= 57
-	devel:libavfilter$secondaryArchSuffix = 6.82.100 compat >= 6
-	devel:libavresample$secondaryArchSuffix = 3.5.0 compat >= 3
-	devel:libswscale$secondaryArchSuffix = 4.6.100 compat >= 4
-	devel:libswresample$secondaryArchSuffix = 2.7.100 compat >= 2
-	devel:libpostproc$secondaryArchSuffix = 54.5.100 compat >= 54
+	ffmpeg${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat
+	devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
+	devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat
+	devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
+	devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
+	devel:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
+	devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
+	devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
+	devel:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
 	"
 REQUIRES_devel="
 	ffmpeg$secondaryArchSuffix == $portVersion base
@@ -101,6 +127,19 @@ GLOBAL_WRITABLE_FILES="
 	settings/ffserver.conf
 	"
 
+defineDebugInfoPackage ffmpeg$secondaryArchSuffix \
+	$libDir/libavcodec.so.$libavcodecVersion \
+	$libDir/libavfilter.so.$libavfilterVersion \
+	$libDir/libavformat.so.$libavformatVersion \
+	$libDir/libavresample.so.$libavresampleVersion \
+	$libDir/libavutil.so.$libavutilVersion \
+	$libDir/libpostproc.so.$libpostprocVersion \
+	$libDir/libswresample.so.$libswresampleVersion \
+	$libDir/libswscale.so.$libswscaleVersion \
+	$prefix/bin/ffmpeg \
+	$prefix/bin/ffprobe \
+	$prefix/bin/ffserver
+
 PATCH()
 {
 	# patch hard-coded config file path
@@ -134,7 +173,8 @@ BUILD()
 		--enable-libvorbis \
 		--enable-libvpx \
 		--enable-gpl \
-		--enable-avresample
+		--enable-avresample \
+		--disable-stripping
 
 	make $jobArgs
 }
@@ -143,16 +183,7 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs \
-		libavcodec \
-		libavdevice \
-		libavfilter \
-		libavformat \
-		libavresample \
-		libavutil \
-		libswresample \
-		libswscale \
-		libpostproc
+	prepareInstalledDevelLibs $ffmpegLibs
 	fixPkgconfig
 
 	# The pkgconfig file reference other libraries using the wrong paths, which
diff --git a/media-video/ffmpeg/patches/ffmpeg-3.3.4.patchset b/media-video/ffmpeg/patches/ffmpeg-3.3.6.patchset
similarity index 83%
rename from media-video/ffmpeg/patches/ffmpeg-3.3.4.patchset
rename to media-video/ffmpeg/patches/ffmpeg-3.3.6.patchset
index 813cb5c7a..1ba2608b3 100644
--- a/media-video/ffmpeg/patches/ffmpeg-3.3.4.patchset
+++ b/media-video/ffmpeg/patches/ffmpeg-3.3.6.patchset
@@ -5,10 +5,10 @@ Subject: disable ebx on x86.
 
 
 diff --git a/configure b/configure
-index a1818dc..26af622 100755
+index 23823e3..275f2ff 100755
 --- a/configure
 +++ b/configure
-@@ -6324,6 +6324,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
+@@ -6401,6 +6401,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
  if test $target_os = "haiku"; then
      disable memalign
      disable posix_memalign
@@ -17,5 +17,5 @@ index a1818dc..26af622 100755
  
  enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
 -- 
-2.7.0
+2.16.2