diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c77209f..bc51e43e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,16 @@ SET(POLYVOX_VERSION_MINOR "1")
 SET(POLYVOX_VERSION_PATCH "0")
 SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}")
 
+OPTION(ENABLE_CPP0X "Does the compiler support C++0x" OFF) #Enable with -DENABLE_CPP0X=ON or in the GUI
+IF(ENABLE_CPP0X)
+	MESSAGE(STATUS "Compiling in C++0x mode")
+	IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
+		ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED -std=c++0x) #Will only work on GCC
+	ELSEIF(MSYS)
+		#ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED)
+	ENDIF()
+ENDIF()
+
 ADD_SUBDIRECTORY(library)
 ADD_SUBDIRECTORY(examples/OpenGL)