diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index 0018b84a0..cdd269f73 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -1,15 +1,13 @@
 SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine"
-DESCRIPTION="
-ScummVM is a program which allows you to run certain classic graphical \
-point-and-click adventure games, provided you already have their data files. \
-The clever part about this: ScummVM just replaces the executables shipped with \
-the games, allowing you to play them on systems for which they were never \
-designed!
-"
+DESCRIPTION="ScummVM is a program which allows you to run certain classic \
+graphical point-and-click adventure games, provided you already have their \
+data files. The clever part about this: ScummVM just replaces the executables \
+shipped with the games, allowing you to play them on systems for which they \
+were never designed!"
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
-REVISION="2"
+REVISION="3"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
@@ -24,55 +22,65 @@ fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	scummvm = $portVersion
-	app:scummvm = $portVersion
+	scummvm$secondaryArchSuffix = $portVersion
+	app:scummvm$secondaryArchSuffix = $portVersion
 "
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libfreetype$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libflac++$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libfluidsynth$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
 	lib:libmad$secondaryArchSuffix
-	lib:libSDL$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
-	lib:libtheora$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
+	lib:libSDL$secondaryArchSuffix
+	lib:libtheora$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libSDL$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libfaad$secondaryArchSuffix
 	devel:libflac++$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libfluidsynth$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	devel:libmad$secondaryArchSuffix
-	devel:libtheora$secondaryArchSuffix
-	devel:libfaad$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
-	devel:libbz2$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libtheora$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:nasm
 	cmd:libtoolize
+	cmd:make
+	cmd:nasm
+	cmd:pkg_config$secondaryArchSuffix
 "
 
 BUILD()
 {
 	libtoolize --force --copy --install
-	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
-		--mandir=$manDir --docdir=$docDir --enable-release
+	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \
+	--bindir=$appsDir 	--libdir=$libDir --datarootdir=$dataDir \
+	--mandir=$manDir --docdir=$docDir \
+	--disable-debug --enable-release #--disable-all-engines
+	#the default build doesn't build all engines, those that are still under
+	#construction can be built with --enable-all-engines for testing purposes
+	#--disable-all-engines can be used to only compile scummvm without
+	#engines, which makes it build faster
 
 	make $jobArgs
 }
diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe
new file mode 100644
index 000000000..a26d6433f
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.7.0.recipe
@@ -0,0 +1,96 @@
+SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine"
+DESCRIPTION="ScummVM is a program which allows you to run certain classic \
+graphical point-and-click adventure games, provided you already have their \
+data files. The clever part about this: ScummVM just replaces the executables \
+shipped with the games, allowing you to play them on systems for which they \
+were never designed!"
+HOMEPAGE="http://scummvm.org"
+SRC_URI="http://sourceforge.net/projects/scummvm/files/scummvm/1.7.0/scummvm-1.7.0.tar.gz"
+CHECKSUM_SHA256="aaee99d06b9c55e1359556908b5faeccfa017f2fdf5d1f3cf978dfb02b5bc301"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2014 ScummVM Team"
+
+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$secondaryArchSuffix = $portVersion
+	app:scummvm$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfaad$secondaryArchSuffix
+	lib:libflac$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libfluidsynth$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libmad$secondaryArchSuffix
+	lib:libmpeg2$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libSDL$secondaryArchSuffix
+	lib:libtheora$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libbz2$secondaryArchSuffix
+	devel:libfaad$secondaryArchSuffix
+	devel:libflac$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libfluidsynth$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libmad$secondaryArchSuffix
+	devel:libmpeg2$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libtheora$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:nasm
+	cmd:pkg_config$secondaryArchSuffix
+"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \
+	--bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
+	--mandir=$manDir --docdir=$docDir \
+	--disable-debug --enable-release #--disable-all-engines
+	#the default build doesn't build all engines, those that are still under
+	#construction can be built with --enable-all-engines for testing purposes
+	#--disable-all-engines can be used to only compile scummvm without
+	#engines, which makes it build faster
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	addAppDeskbarSymlink $appsDir/scummvm ScummVM
+}