diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87fa688ee0..704639f85b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,12 +86,18 @@ IF(${HZ_VALGRIND} MATCHES "ON")
 	set(HZ_VALGRIND_LINK_FLAGS " -O0 ") 
 ENDIF(${HZ_VALGRIND} MATCHES "ON")
 
+set(HZ_C11_FLAGS "")
+IF(${HZ_USE_C11} MATCHES "ON")
+	set(HZ_C11_FLAGS "-std=c++11")
+	message(STATUS "C++11 compiler is turned on.")
+ENDIF(${HZ_USE_C11} MATCHES "ON")
+
 message(STATUS "${CMAKE_SYSTEM}")
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	message(STATUS "APPLE ENVIRONMENT DETECTED")
 
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall -Werror")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall -Werror ${HZ_C11_FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall ${HZ_C11_FLAGS}")
 
 	link_libraries(${HZ_LIB_NAME} )
 
@@ -100,8 +106,8 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	message(STATUS "LINUX ENVIRONMENT DETECTED")
 		
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall -Werror -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS ${HZ_BIT_FLAG} ${HZ_CODE_COVERAGE_COMPILE_FLAGS} ${HZ_VALGRIND_COMPILE_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS ${HZ_BIT_FLAG} ${HZ_CODE_COVERAGE_COMPILE_FLAGS} ${HZ_VALGRIND_COMPILE_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall -Werror -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS ${HZ_BIT_FLAG} ${HZ_CODE_COVERAGE_COMPILE_FLAGS} ${HZ_VALGRIND_COMPILE_FLAGS} ${HZ_C11_FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS ${HZ_BIT_FLAG} ${HZ_CODE_COVERAGE_COMPILE_FLAGS} ${HZ_VALGRIND_COMPILE_FLAGS} ${HZ_C11_FLAGS}")
 
 	link_libraries(${HZ_LIB_NAME} pthread rt )
 
@@ -117,8 +123,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 		add_definitions(-DHAZELCAST_EXPORTS=0)
 	ENDIF(${HZ_LIB_TYPE} MATCHES "SHARED")
 
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /EHsc")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /EHsc")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /EHsc ${HZ_C11_FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /EHsc ${HZ_C11_FLAGS}")
 
 	link_libraries(${HZ_LIB_NAME})
 	
diff --git a/hazelcast/include/hazelcast/util/Bits.h b/hazelcast/include/hazelcast/util/Bits.h
index 98309ed281..5fbbe00b6b 100644
--- a/hazelcast/include/hazelcast/util/Bits.h
+++ b/hazelcast/include/hazelcast/util/Bits.h
@@ -293,7 +293,7 @@ namespace hazelcast {
             }
 
             inline static void swapInplace4(void *orig) {
-                register uint32_t value = * reinterpret_cast<const uint32_t*> (orig);
+                uint32_t value = * reinterpret_cast<const uint32_t*> (orig);
                 swap_4(&value, orig);
             }
 
diff --git a/hazelcast/test/common/containers/LitlleEndianBufferTest.cpp b/hazelcast/test/common/containers/LitlleEndianBufferTest.cpp
index cfa035ac3a..ba045006b7 100644
--- a/hazelcast/test/common/containers/LitlleEndianBufferTest.cpp
+++ b/hazelcast/test/common/containers/LitlleEndianBufferTest.cpp
@@ -145,7 +145,7 @@ namespace hazelcast {
                         }
                         // ----- Test signed get ends ---------------------------------
 
-                        byte firstChar = 'B';
+                        const byte firstChar = 'B';
                         byte strBytes[8] = {4, 0, 0, 0, /* This part is the len field which is 4 bytes */
                                             firstChar, firstChar + 1, firstChar + 2, firstChar + 3}; // This is string BCDE