diff --git a/include/compat/mingw/unordered_map b/include/compat/mingw/unordered_map
deleted file mode 100644
index 22f82dd..0000000
--- a/include/compat/mingw/unordered_map
+++ /dev/null
@@ -1 +0,0 @@
-#include <tr1/unordered_map>
diff --git a/include/compat/mingw/unordered_set b/include/compat/mingw/unordered_set
deleted file mode 100644
index cd6ade8..0000000
--- a/include/compat/mingw/unordered_set
+++ /dev/null
@@ -1 +0,0 @@
-#include <tr1/unordered_set>
diff --git a/premake/toolchain.lua b/premake/toolchain.lua
index 7f30717..395a596 100755
--- a/premake/toolchain.lua
+++ b/premake/toolchain.lua
@@ -110,8 +110,8 @@ function toolchain(_buildDir, _libDir)
 		end
 
 		if "mingw" == _OPTIONS["gcc"] then
-			premake.gcc.cc = "$(MINGW)/bin/mingw32-gcc"
-			premake.gcc.cxx = "$(MINGW)/bin/mingw32-g++"
+			premake.gcc.cc = "$(MINGW)/bin/x86_64-w64-mingw32-gcc"
+			premake.gcc.cxx = "$(MINGW)/bin/x86_64-w64-mingw32-g++"
 			premake.gcc.ar = "$(MINGW)/bin/ar"
 			location (_buildDir .. "projects/" .. _ACTION .. "-mingw")
 		end
@@ -278,7 +278,7 @@ function toolchain(_buildDir, _libDir)
 		defines { "WIN32" }
 		includedirs { bxDir .. "include/compat/mingw" }
 		buildoptions {
-			"-std=c++0x",
+			"-std=c++11",
 			"-U__STRICT_ANSI__",
 			"-Wunused-value",
 			"-fdata-sections",