diff --git a/config/master.cfg b/config/master.cfg
index 5508d05..68ba5d2 100644
--- a/config/master.cfg
+++ b/config/master.cfg
@@ -286,23 +286,23 @@ scumm_platforms_stable["debian-x86-clang"] = p
 scumm_buildonly_platforms.append("debian-x86-clang")
 
 # MinGW 32bit, using the Win32 targetting MinGW-w64 compiler from the Debian repositories.
-scumm_root_mingw_w32 = "/opt/toolchains/mxe/usr/i686-w64-mingw32.static"
+scumm_root_mingw_w32 = "/opt/toolchains/i686-w64-mingw32"
 scumm_env_mingw_w32 = copy.deepcopy(scumm_env)
-scumm_env_mingw_w32["PATH"] = "/opt/toolchains/mxe/usr/bin:%s/bin:%s" % (scumm_root_mingw_w32, DEFAULT_PATH)
-scumm_env_mingw_w32["CXX"] = "/opt/toolchains/mxe/usr/bin/i686-w64-mingw32.static-g++"
-#scumm_env_mingw_w32["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w32
-#scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32
+scumm_env_mingw_w32["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w32, DEFAULT_PATH)
+scumm_env_mingw_w32["CXX"] = "ccache i686-w64-mingw32-g++"
+scumm_env_mingw_w32["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w32
+scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32
 scumm_env_mingw_w32["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_root_mingw_w32
 
 p = {
 	"configureargs": [
-		"--host=i686-w64-mingw32.static"
+		"--host=i686-w64-mingw32"
 	],
 	"configureargs-tools": [
-		"--host=i686-w64-mingw32.static"
+		"--host=i686-w64-mingw32"
 	],
 	"env": scumm_env_mingw_w32,
-	"strip": "/opt/toolchains/mxe/usr/bin/i686-w64-mingw32.static-strip scummvm.exe",
+	"strip": "i686-w64-mingw32-strip scummvm.exe",
 	"package": [
 		"scummvm.exe",
 		"%s/bin/SDL2.dll" % scumm_root_mingw_w32,
@@ -330,23 +330,23 @@ scumm_platforms_stable["mingw-w32"] = p
 scumm_desktop_platforms.append("mingw-w32")
 
 # MinGW 64bit, using the Win64 targetting MinGW-w64 compiler from the Debian repositories.
-scumm_root_mingw_w64 = "/opt/toolchains/mxe/usr/x86_64-w64-mingw32.static"
+scumm_root_mingw_w64 = "/opt/toolchains/x86_64-w64-mingw32"
 scumm_env_mingw_w64 = copy.deepcopy(scumm_env)
-scumm_env_mingw_w64["PATH"] = "/opt/toolchains/mxe/usr/bin:%s/bin:%s" % (scumm_root_mingw_w64, DEFAULT_PATH)
-scumm_env_mingw_w64["CXX"] = "/opt/toolchains/mxe/usr/bin/x86_64-w64-mingw32.static-g++"
-#scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w64
-#scumm_env_mingw_w64["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w64
+scumm_env_mingw_w64["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w64, DEFAULT_PATH)
+scumm_env_mingw_w64["CXX"] = "ccache x86_64-w64-mingw32-g++"
+scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w64
+scumm_env_mingw_w64["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w64
 scumm_env_mingw_w64["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_root_mingw_w64
 
 p = {
 	"configureargs": [
-		"--host=x86_64-w64-mingw32.static"
+		"--host=x86_64-w64-mingw32"
 	],
 	"configureargs-tools": [
-		"--host=x86_64-w64-mingw32.static"
+		"--host=x86_64-w64-mingw32"
 	],
 	"env": scumm_env_mingw_w64,
-	"strip": "/opt/toolchains/mxe/usr/bin/x86_64-w64-mingw32.static-strip scummvm.exe",
+	"strip": "x86_64-w64-mingw32-strip scummvm.exe",
 	"package": [
 		"scummvm.exe",
 		"%s/bin/SDL2.dll" % scumm_root_mingw_w64,