diff --git a/games-engines/scummvm-tools/scummvm_tools-2.0.0.recipe b/games-engines/scummvm-tools/scummvm_tools-2.0.0.recipe
new file mode 100644
index 000000000..dfceea723
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm_tools-2.0.0.recipe
@@ -0,0 +1,88 @@
+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="https://www.scummvm.org/"
+COPYRIGHT="2001-2013 ScummVM Team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://www.scummvm.org/frs/scummvm-tools/$portVersion/scummvm-tools-$portVersion.tar.xz"
+CHECKSUM_SHA256="c2042ccdc6faaf745552bac2c00f213da382a7e382baa96343e508fced4451b3"
+SOURCE_DIR="scummvm-tools-$portVersion"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	cmd:construct_mohawk = $portVersion
+	cmd:create_sjisfnt = $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
+	# not working yet for Qt
+	#cmd:scummvm_tools = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libflac$secondaryArchSuffix
+	lib:libmad$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	# not working yet for Qt
+	#lib:libqt5$secondaryArchSuffix
+	#lib:libQt5Core$secondaryArchSuffix
+	#lib:libQt5Gui$secondaryArchSuffix
+	#lib:libQt5Widgets$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
+	# not working yet for Qt
+	#devel:libqt5$secondaryArchSuffix
+	#devel:libQt5Core$secondaryArchSuffix
+	#devel:libQt5Gui$secondaryArchSuffix
+	#devel:libQt5Widgets$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	# not working yet for Qt
+	#cmd:wx_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	libtoolize -fci
+	./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.1.recipe b/games-engines/scummvm/scummvm-2.0.0.recipe
similarity index 79%
rename from games-engines/scummvm/scummvm-1.8.1.recipe
rename to games-engines/scummvm/scummvm-2.0.0.recipe
index e41e504dd..1b6e77706 100644
--- a/games-engines/scummvm/scummvm-1.8.1.recipe
+++ b/games-engines/scummvm/scummvm-2.0.0.recipe
@@ -4,15 +4,16 @@ 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"
+HOMEPAGE="https://www.scummvm.org/"
 COPYRIGHT="2001-2014 ScummVM Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="http://scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.xz"
-CHECKSUM_SHA256="935f53d7e4c460fbc22c58fee5007d4858891e4961831f53f575a3594b7f612a"
-ADDITIONAL_FILES="scummvm.rdef"
+SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.gz"
+CHECKSUM_SHA256="f613131f45f4e20ed6088706e34a38ececb326ff979926f170b7cf6b9297ea8d"
 
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+ADDITIONAL_FILES="scummvm.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -22,6 +23,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix
+	#lib:libcurl$secondaryArchSuffix #not needed yet
 	lib:libbz2$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libflac$secondaryArchSuffix
@@ -33,8 +35,9 @@ REQUIRES="
 	lib:libmad$secondaryArchSuffix
 	lib:libmpeg2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libSDL$secondaryArchSuffix
+	#lib:libsdl_net$secondaryArchSuffix #not needed yet
 	lib:libtheora$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -42,6 +45,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	#devel:libcurl$secondaryArchSuffix #not needed yet
 	devel:libbz2$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
@@ -55,6 +59,7 @@ BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libSDL$secondaryArchSuffix
+	#devel:libsdl_net$secondaryArchSuffix #not needed yet
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -75,7 +80,7 @@ BUILD()
 	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \
 		--bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
 		--mandir=$manDir --docdir=$docDir \
-		--disable-debug --enable-release --disable-eventrecorder \
+		--disable-debug --enable-release --disable-eventrecorder #\
 		#--disable-all-engines #can be used to compile scummvm without \
 		#engines, which makes it build faster (to test), those that \
 		#are still under construction can be built with --enable-all-engines \
@@ -88,6 +93,9 @@ INSTALL()
 	make install
 	mv $appsDir/scummvm $appsDir/ScummVM
 
+	#we are not linux
+	rm -r $dataDir/{applications,appdata,icons,pixmaps}
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -95,7 +103,7 @@ INSTALL()
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/scummvm.rdef > scummvm.rdef
+		$portDir/additional-files/scummvm.rdef.in > scummvm.rdef
 
 	addResourcesToBinaries scummvm.rdef \
 		$appsDir/ScummVM