diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a4b2e929..371f6e333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,12 @@ set(DESKFLOW_VERSION_TWEAK 0)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   find_package(Git)
   if(GIT_FOUND)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      OUTPUT_VARIABLE GIT_SHA_SHORT
+      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
     execute_process(
       COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index de8106d63..f27904c70 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -22,12 +22,6 @@ macro(configure_definitions)
   set(INTEG_TESTS_BIN integtests)
   set(UNIT_TESTS_BIN unittests)
 
-  if(NOT "$ENV{GIT_SHA}" STREQUAL "")
-    # Shorten the Git SHA to 8 chars for readability
-    string(SUBSTRING "$ENV{GIT_SHA}" 0 8 GIT_SHA_SHORT)
-    message(STATUS "Short Git SHA: ${GIT_SHA_SHORT}")
-  endif()
-
   if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Disabling debug build")
     add_definitions(-DNDEBUG)