diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
index 687c49e..82ea52c 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
@@ -70,6 +70,27 @@ src_configure() {
 
 src_compile() {
 	cd "${BUILDDIR}"
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg
+		mv {,native-}host_jskwgen
+		mv {,native-}host_jsoplengen
+		mv config/{,native-}nsinstall
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk
+		rm config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o
+	fi
 	emake || die
 }
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 5a80e36..43250ff 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,3 +1,3 @@
 AUX 0.10.13/gst-plugins-ffmpeg-0.10.13-adjust-rank.patch 2592 RMD160 a3a3fb573d165e53dea7d63be888c0cc2782486d SHA1 6e55bac5140be5b5181a605f8cf06054b3cc4dd2 SHA256 cbbc6d92421dd75bf64160a0545d7c82b13c86e3de8d72553f430ab4909ab1b5
 DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 RMD160 3e5e3d44302665214cfde8a908b633f8d0f70d31 SHA1 8de5c848638c16c6c6c14ce3b22eecd61ddeed44 SHA256 76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62
-EBUILD gst-plugins-ffmpeg-0.10.13-r3.ebuild 1662 RMD160 4b1e22bd239193505df12e36e608483fb5a90f21 SHA1 8974b2b30f578b9ebeb0b210a9640a7d62487cc6 SHA256 37a1b9b40573277d0ece55332288a6f6866f0badc60a516e534ac99a379101fe
+EBUILD gst-plugins-ffmpeg-0.10.13-r3.ebuild 1677 RMD160 4368d834093b1fa3ee720ec444c22b03d5b6fd23 SHA1 b729e33846dee2e7a55fd4307d08bd02e5b432e2 SHA256 b421e6923d8e09b1081c5a9ba78d4febdb66f455db29413be40947ffe8461afa
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r3.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r3.ebuild
index 5f36a18..7b22a78 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r3.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r3.ebuild
@@ -41,7 +41,7 @@ src_compile() {
 	append-flags -fno-strict-aliasing
 
 	extra_config="$(use_enable orc)"
-	ffmpeg_extra_config="--target-os=linux"
+	ffmpeg_extra_config="--target-os=linux --arch=${ARCH}"
 
 	if tc-is-cross-compiler; then
 		cc="$(tc-getCC)"