diff --git a/CMakeLists.txt b/CMakeLists.txt
index e68cfc7..a4a206d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,10 +141,11 @@ if(UNIX)
 	target_link_libraries(uhub-admin adcclient adc network utils)
 endif()
 
-if(GIT_FOUND)
+if(GIT_FOUND AND IS_DIRECTORY ".git")
 	execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%h OUTPUT_VARIABLE UHUB_REVISION)
 	set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-git-${UHUB_REVISION}")
 else()
+	set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-release")
 endif()
 
 if(OPENSSL_FOUND)
diff --git a/src/version.h.in b/src/version.h.in
index 1fa1923..88b6038 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -23,14 +23,12 @@
 #define VERSION "@UHUB_VERSION_MAJOR@.@UHUB_VERSION_MINOR@.@UHUB_VERSION_PATCH@"
 #endif
 
-#define GIT_REVISION "@UHUB_REVISION@"
 #define GIT_VERSION "@UHUB_GIT_VERSION@"
 
 #ifndef PRODUCT
 #define PRODUCT "uhub"
 #endif
 
-#define REVISION GIT_REVISION
 #define PRODUCT_STRING PRODUCT "/" GIT_VERSION
 
 #ifndef COPYRIGHT