diff --git a/games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe
new file mode 100644
index 000000000..4444a8b5c
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Tools for ScummVM"
+DESCRIPTION="This is a collection of various tools that may be useful to use \
+in conjunction with ScummVM. Please note that although a tool may support a \
+feature, certain ScummVM versions may not. ScummVM 0.6.x does not support \
+FLAC audio, for example."
+HOMEPAGE="http://scummvm.org"
+COPYRIGHT="2001-2013 ScummVM Team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://scummvm.org/frs/scummvm-tools/1.8.0/scummvm-tools-1.8.0.tar.xz"
+CHECKSUM_SHA256="2c14050cee3fb8e178cb9ff16a4412ab584001757b4824c75b24240eb2d98bdd"
+SOURCE_DIR="scummvm-tools-1.8.0"
+#PATCHES="scummvm_tools-1.7.0.patch"
+
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	cmd:construct_mohawk = $portVersion
+	cmd:decine = $portVersion
+	cmd:degob = $portVersion
+	cmd:dekyra = $portVersion
+	cmd:deriven = $portVersion
+	cmd:descumm = $portVersion
+	cmd:desword2 = $portVersion
+	cmd:extract_mohawk = $portVersion
+	cmd:gob_loadcalc = $portVersion
+	cmd:scummvm_tools_cli = $portVersion
+	cmd:create_sjisfnt = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libflac$secondaryArchSuffix
+	lib:libmad$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libvorbis$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libflac$secondaryArchSuffix
+	devel:libmad$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	./configure --prefix=$prefix --datadir=$dataDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	#data files are not needed as long as we don't have a graphical interface for the tools
+	rm -r $dataDir/scummvm-tools
+}
diff --git a/games-engines/scummvm/scummvm-1.8.0.recipe b/games-engines/scummvm/scummvm-1.8.0.recipe
new file mode 100644
index 000000000..58047a6b3
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.8.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"
+SOURCE_URI="http://scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.xz"
+CHECKSUM_SHA256="a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2014 ScummVM Team"
+
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+ADDITIONAL_FILES="scummvm.rdef"
+
+PROVIDES="
+	scummvm$secondaryArchSuffix = $portVersion
+	app:scummvm$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libfaad$secondaryArchSuffix
+	lib:libflac$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libfluidsynth$secondaryArchSuffix
+	lib:libgl$secondaryArchSuffix
+	lib:libglu$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
+	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
+	#--disable-all-engines can be used to only compile scummvm without
+	#engines, which makes it build faster, those that are still under
+	#construction can be built with --enable-all-engines for testing purposes
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	mv $appsDir/scummvm $appsDir/ScummVM
+	addResourcesToBinaries $portDir/additional-files/scummvm.rdef \
+		$appsDir/ScummVM
+
+	addAppDeskbarSymlink $appsDir/ScummVM ScummVM
+}