diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe424728..3e639e1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake)
 
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
   execute_process(
-    COMMAND git log -1 --format=%h
+    COMMAND git describe --always
     OUTPUT_VARIABLE GIT_COMMIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-  set(GIT_COMMIT_HASH "Not Found")
 endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
 
 SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"")