diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83413f3e7..0a3070c16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,37 +25,57 @@ option(WITH_LTO "Enable Link Time Optimization (LTO)" OFF)
 
 set( KEEPASSX_VERSION "0.9.0" )
 
-if("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
+endif("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+
+if("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  set(CMAKE_COMPILER_IS_CLANGXX 1)
 endif("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
-macro(add_compiler_flags FLAGS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
-endmacro(add_compiler_flags)
+macro(add_gcc_compiler_cxxflags FLAGS)
+  if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
+  endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+endmacro(add_gcc_compiler_cxxflags)
+
+macro(add_gcc_compiler_cflags FLAGS)
+  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
+  endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+endmacro(add_gcc_compiler_cflags)
+
+macro(add_gcc_compiler_flags FLAGS)
+  add_gcc_compiler_cxxflags("${FLAGS}")
+  add_gcc_compiler_cflags("${FLAGS}")
+endmacro(add_gcc_compiler_flags)
 
 add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_NO_STL -DQT_STRICT_ITERATORS)
 
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-    add_compiler_flags("-ansi -fno-common -fstack-protector -D_FORTIFY_SOURCE=2")
-    add_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
-    add_compiler_flags("-Wformat=2 -Werror=format-security -Wmissing-format-attribute")
+add_gcc_compiler_flags("-ansi -fno-common -fstack-protector -D_FORTIFY_SOURCE=2")
+add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
+add_gcc_compiler_flags("-Wformat=2 -Werror=format-security -Wmissing-format-attribute")
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Werror=implicit-function-declaration")
+add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
+add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
+add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings -Werror=implicit-function-declaration")
 
-    if(CMAKE_COMPILER_IS_GNUCXX)
-      add_compiler_flags("-Wcast-align --param=ssp-buffer-size=4")
-    else()
-      add_compiler_flags("-mllvm -stack-protector-buffer-size=4")
-    endif(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_COMPILER_IS_CLANGXX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -stack-protector-buffer-size=4")
+elseif(CMAKE_COMPILER_IS_GNUCXX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align --param=ssp-buffer-size=4")
+endif(CMAKE_COMPILER_IS_CLANGXX)
 
-    if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
-    endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+if(CMAKE_COMPILER_IS_CLANG)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mllvm -stack-protector-buffer-size=4")
+elseif(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align --param=ssp-buffer-size=4")
+endif(CMAKE_COMPILER_IS_CLANG)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
 if(WITH_LTO)
   include(CheckCXXCompilerFlag)
@@ -64,7 +84,7 @@ if(WITH_LTO)
     check_cxx_compiler_flag("-flto -fuse-linker-plugin" LTO_AVAILABLE)
 
     if(LTO_AVAILABLE)
-      add_compiler_flags("-flto -fuse-linker-plugin")
+      add_gcc_compiler_flags("-flto -fuse-linker-plugin")
     else()
       message(FATAL_ERROR "This version of gcc doesn't support LTO")
     endif(LTO_AVAILABLE)