diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index 03f773944..d4e1c178d 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -8,54 +8,79 @@ designed!
 "
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
+
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
-SRC_FILENAME="scummvm-$portVersion.tar.bz2"
+
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
-ARCHITECTURES="x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86 ?x86_64"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	scummvm = $portVersion
 	app:scummvm = $portVersion
 "
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libfaad$secondaryArchSuffix
+	lib:libflac++$secondaryArchSuffix
+	lib:libmad$secondaryArchSuffix
 	lib:libSDL$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
+	lib:libtheora$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
 "
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libSDL$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libflac++$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
+	devel:libmad$secondaryArchSuffix
+	devel:libtheora$secondaryArchSuffix
+	devel:libfaad$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 "
+
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:nasm$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:nasm
 	cmd:libtoolize
 "
 
-SOURCE_DIR="scummvm-1.6.0"
-
 BUILD()
 {
 	libtoolize --force --copy --install
-	./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir --mandir=$manDir --docdir=$docDir \
-		--enable-release
-	make
+	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
+		--mandir=$manDir --docdir=$docDir --enable-release
+
+	make $jobArgs
 }
+
 INSTALL()
 {
 	make install
 	
-	addAppDeskbarSymlink $appsDir/scummvm
+	addAppDeskbarSymlink $appsDir/scummvm ScummVM
 }