diff --git a/CMakeLists.txt b/CMakeLists.txt
index 558e9c51c..b32343c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 2.8)
 include (CheckFunctionExists)
 
+set (HAVE_CMAKE true)
+
 project (task)
 set (PROJECT_VERSION "1.9.4")
 
diff --git a/cmake.h.in b/cmake.h.in
index 5a5cc817d..0fc2aa9dc 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -12,6 +12,10 @@
 /* git information */
 #cmakedefine HAVE_COMMIT
 
+/* cmake information */
+#cmakedefine HAVE_CMAKE
+#define CMAKE_VERSION "${CMAKE_VERSION}"
+
 /* Compiling platform */
 #cmakedefine LINUX
 #cmakedefine DARWIN
diff --git a/src/diag.cpp b/src/diag.cpp
index 1e2621e9b..b1e87eb90 100644
--- a/src/diag.cpp
+++ b/src/diag.cpp
@@ -138,6 +138,9 @@ void handleDiagnostics (std::string& outs)
             << "     Built: " << __DATE__ << " " << __TIME__ << "\n"
 #ifdef HAVE_COMMIT
             << "    Commit: " << COMMIT << "\n"
+#endif
+#ifdef HAVE_CMAKE
+            << "     CMake: " << CMAKE_VERSION << "\n"
 #endif
             << "      Caps:"
 #ifdef HAVE_LIBPTHREAD