diff --git a/havoc/CMakeLists.txt b/havoc/CMakeLists.txt
index a3bce95..101308d 100644
--- a/havoc/CMakeLists.txt
+++ b/havoc/CMakeLists.txt
@@ -22,7 +22,14 @@ if (CMAKE_COMPILER_IS_GNUCC)
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -DNDEBUG ")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
 	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
-endif (CMAKE_COMPILER_IS_GNUCC	)
+endif (CMAKE_COMPILER_IS_GNUCC)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        set(GCC_COMPILE_FLAGS "-fno-operator-names -pthread -std=c++1y")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -DNDEBUG ")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
+	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
+endif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
 add_library (havoc
 	diff.h
diff --git a/turing/CMakeLists.txt b/turing/CMakeLists.txt
index 70cd6cc..e04ab91 100644
--- a/turing/CMakeLists.txt
+++ b/turing/CMakeLists.txt
@@ -46,6 +46,13 @@ if (CMAKE_COMPILER_IS_GNUCC)
     set(LINK_LIBRARIES ${LINK_LIBRARIES} -pthread rt)
 endif (CMAKE_COMPILER_IS_GNUCC)
 
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-fno-operator-names -pthread -std=c++1y)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -DNDEBUG ")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -DVALGRIND_FRIENDLY")
+    set(LINK_LIBRARIES ${LINK_LIBRARIES} -pthread rt)
+endif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
 set(SEI_HEADERS
     sei/ReadSei.h
     sei/active_parameter_sets.h