diff --git a/config/master.cfg b/config/master.cfg
index eae6557..7b76af8 100644
--- a/config/master.cfg
+++ b/config/master.cfg
@@ -143,9 +143,11 @@ scumm_env_debian_x86_64["LDFLAGS"] = "-m64 -Wl,-rpath,%s/lib -Wl,-rpath,%s/usr/l
 
 p = {
 	"configureargs": [
-		"--host=x86_64-unknown-linux-gnu",
+		"--host=x86_64-unknown-linux-gnu"
+	],
+	"configureargs-tools": [
+		"--host=x86_64-unknown-linux-gnu"
 	],
-	"configureargs-tools": [ ],
 	"env": scumm_env_debian_x86_64,
 	"package": [ "scummvm" ],
 	"package-tools": [
@@ -179,9 +181,11 @@ scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32
 
 p = {
 	"configureargs": [
-		"--host=i586-mingw32msvc",
+		"--host=i586-mingw32msvc"
+	],
+	"configureargs-tools": [
+		"--host=i586-mingw32msvc"
 	],
-	"configureargs-tools": [ ],
 	"env": scumm_env_mingw_w32,
 	"strip": "i586-mingw32msvc-strip scummvm.exe",
 	"package": [
@@ -221,7 +225,9 @@ p = {
 	"configureargs": [
 		"--host=x86_64-w64-mingw32"
 	],
-	"configureargs-tools": [ ],
+	"configureargs-tools": [
+		"--host=x86_64-w64-mingw32"
+	],
 	"env": scumm_env_mingw_w64,
 	"strip": "%s/bin/x86_64-w64-mingw32-strip scummvm.exe" % scumm_root_mingw_w64,
 	"package": [
@@ -342,9 +348,12 @@ p = {
 	"configureargs": [
 		"--host=i686-apple-darwin9",
 		"--disable-nasm",
-		"--with-staticlib-prefix=%s" % scumm_root_osx_intel,
+		"--with-staticlib-prefix=%s" % scumm_root_osx_intel
+	],
+	"configureargs-tools": [
+		"--host=i686-apple-darwin9",
+		"--with-staticlib-prefix=%s" % scumm_root_osx_intel
 	],
-	"configureargs-tools": [ ],
 	"env": scumm_env_osx_intel,
 	"disttarget": "bundle",
 	"package": [ "ScummVM.app" ],
@@ -381,9 +390,12 @@ scumm_env_osx_ppc["MACOSX_DEPLOYMENT_TARGET"] = "10.2"
 p = {
 	"configureargs": [
 		"--host=ppc-apple-darwin8",
-		"--with-staticlib-prefix=%s" % scumm_root_osx_ppc,
+		"--with-staticlib-prefix=%s" % scumm_root_osx_ppc
+	],
+	"configureargs-tools": [
+		"--host=ppc-apple-darwin8",
+		"--with-staticlib-prefix=%s" % scumm_root_osx_ppc
 	],
-	"configureargs-tools": [ ],
 	"env": scumm_env_osx_ppc,
 	"disttarget": "bundle",
 	"package": [ "ScummVM.app" ],