diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 82f35a4..5159cad 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -194,7 +194,6 @@ function toolchain(_buildDir, _libDir)
 	end
 
 	flags {
-		"Cpp11",
 		"ExtraWarnings",
 	}
 
@@ -645,6 +644,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		linkoptions {
 			"-Wl,--gc-sections",
 			"-static",
@@ -732,6 +734,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wundef",
 --			"-Wuseless-cast",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		links {
 			"rt",
 			"dl",
@@ -781,6 +786,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		links {
 			"rt",
 			"dl",
@@ -797,6 +805,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		links {
 			"rt",
 			"dl",
@@ -835,6 +846,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		linkoptions {
 			"-no-canonical-prefixes",
 			"-Wl,--no-undefined",
@@ -852,6 +866,7 @@ function toolchain(_buildDir, _libDir)
 			"__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it.
 		}
 		buildoptions {
+			"-std=c++11",
 			"-Wfatal-errors",
 			"-Wunused-value",
 			"-Wundef",
@@ -966,6 +981,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 
 	configuration { "freebsd" }
 		targetdir (path.join(_buildDir, "freebsd/bin"))
@@ -1023,6 +1041,12 @@ function toolchain(_buildDir, _libDir)
 		objdir (path.join(_buildDir, "osx_universal/bin"))
 
 	configuration { "osx" }
+		buildoptions_cpp {
+			"-std=c++11",
+		}
+		buildoptions_objcpp {
+			"-std=c++11",
+		}
 		buildoptions {
 			"-Wfatal-errors",
 			"-msse2",
@@ -1035,6 +1059,12 @@ function toolchain(_buildDir, _libDir)
 		linkoptions {
 			"-lc++",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
+		buildoptions_objcpp {
+			"-std=c++11",
+		}
 		buildoptions {
 			"-Wfatal-errors",
 			"-Wunused-value",
@@ -1177,6 +1207,9 @@ function toolchain(_buildDir, _libDir)
 			"$(SCE_ORBIS_SDK_DIR)/target/include",
 			"$(SCE_ORBIS_SDK_DIR)/target/include_common",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 
 	configuration { "rpi" }
 		targetdir (path.join(_buildDir, "rpi/bin"))
@@ -1193,6 +1226,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 		includedirs {
 			"/opt/vc/include",
 			"/opt/vc/include/interface/vcos/pthreads",
@@ -1222,6 +1258,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wundef",
 			"--sysroot=$(FREEDOM_E_SDK)/toolchain/riscv32-unknown-elf",
 		}
+		buildoptions_cpp {
+			"-std=c++11",
+		}
 
 	configuration {} -- reset configuration