diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35faaf819..af268e707 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(POLARSSL C)
 
-string(REGEX MATCH "clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER}")
+string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
 
 if(CMAKE_COMPILER_IS_GNUCC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")
diff --git a/ChangeLog b/ChangeLog
index a2382cfd4..25a9fb40e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ Bugfix
    * Fix dependencies issues in X.509 test suite.
    * Some parts of ssl_tls.c were compiled even when the module was disabled.
    * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer)
+   * Fix detection of Clang on some Apple platforms with CMake
+     (found by Barry K. Nathan)
 
 = PolarSSL 1.3.6 released on 2014-04-11