diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ad8b364..4ddd34db3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ elseif(APPLE)
 	#on os x clang adds pthread for us but we need to add it for gcc
 	if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		add_flags_cxx("-pthread")
+		add_flags_cxx("-std=c++11")
 	endif()
 else()
 	# Let gcc / clang know that we're compiling a multi-threaded app:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3af6aedd..275099540 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,10 +2,6 @@
 cmake_minimum_required (VERSION 2.8.2)
 project (MCServer)
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
-endif()
-
 include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/")
 include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include")