diff --git a/media-video/ffmpeg/ffmpeg-0.11.5.recipe b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
index 73a35acf8..6756e19ba 100644
--- a/media-video/ffmpeg/ffmpeg-0.11.5.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
@@ -13,12 +13,14 @@ COPYRIGHT="
 	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.11.5.tar.bz2"
 CHECKSUM_SHA256="9492991f44d6757080f457c0aef83e68884dbfb925666806c7f7ea0389e5b8c0"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
 	PATCHES="ffmpeg-0.11.5-gcc2.patch"
+else
+	PATCHES="ffmpeg-0.11.5-gcc4.patch"
 fi
 
 PROVIDES="
@@ -114,7 +116,12 @@ BUILD()
 		--enable-libvpx \
 		--disable-amd3dnow
 
-	make $jobArgs CFLAGS="-fno-PIC -std=gnu9x"
+	if [ "$effectiveTargetArchitecture" == "x86_64" ]; then
+		pic=-fPIC
+	else
+		pic=-fno-PIC
+	fi
+	make $jobArgs CFLAGS="$pic -std=gnu9x"
 }
 
 INSTALL()
diff --git a/media-video/ffmpeg/patches/ffmpeg-0.11.5-gcc4.patch b/media-video/ffmpeg/patches/ffmpeg-0.11.5-gcc4.patch
new file mode 100644
index 000000000..504dcbb94
--- /dev/null
+++ b/media-video/ffmpeg/patches/ffmpeg-0.11.5-gcc4.patch
@@ -0,0 +1,22 @@
+From c30864d40845001a62a3f160ad2e28b0612399e8 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Fri, 24 Oct 2014 11:03:59 +0200
+Subject: Fix utf8 in documentation.
+
+
+diff --git a/doc/filters.texi b/doc/filters.texi
+index 324a154..7303a7d 100644
+--- a/doc/filters.texi
++++ b/doc/filters.texi
+@@ -2924,7 +2924,7 @@ Tile several successive frames together.
+ It accepts as argument the tile size (i.e. the number of lines and columns)
+ in the form "@var{w}x@var{h}".
+ 
+-For example, produce 8×8 PNG tiles of all keyframes (@option{-skip_frame
++For example, produce 8x8 PNG tiles of all keyframes (@option{-skip_frame
+ nokey}) in a movie:
+ @example
+ ffmpeg -skip_frame nokey -i file.avi -vf 'scale=128:72,tile=8x8' -an -vsync 0 keyframes%03d.png
+-- 
+1.8.3.4
+