diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee386fb7..115189d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,3 @@
-# Version number of the application
-set (DFT_TOOLS_VERSION "1.5")
-set (DFT_TOOLS_RELEASE "1.5.0")
-
 # Default to Release build type
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build" FORCE)
@@ -30,8 +26,17 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTA
 endif()
 message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -------------")
 
-# Macro defined in TRIQS which picks the hash of repo.
+# Use git to detect Cthyb version and git hash
+execute_process(COMMAND bash "-c" "${TRIQS_GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\""
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ OUTPUT_VARIABLE   DFT_TOOLS_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+if(NOT DFT_TOOLS_VERSION)
+  set(DFT_TOOLS_VERSION 1.5)
+endif()
 triqs_get_git_hash_of_source_dir(DFT_TOOLS_GIT_HASH)
+MESSAGE(STATUS "Dft_tools version : ${DFT_TOOLS_VERSION}")
 message(STATUS "Git hash: ${DFT_TOOLS_GIT_HASH}")
 
 add_subdirectory(fortran/dmftproj) 
diff --git a/doc/conf.py.in b/doc/conf.py.in
index ea3819ab..2f62391a 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -20,7 +20,6 @@ source_suffix = '.rst'
 project = u'TRIQS DFTTools'
 copyright = u'2011-2013, M. Aichhorn, L. Pourovskii, V. Vildosola, C. Martins'
 version = '@DFT_TOOLS_VERSION@'
-release = '@DFT_TOOLS_RELEASE@'
 
 mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default"
 templates_path = ['@CMAKE_SOURCE_DIR@/doc/_templates']