diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e14d09..2e8c11d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,20 +121,13 @@ if(UNIX)
 	endif()
 endif()
 
-if (NOT UHUB_REVISION AND GIT_FOUND)
-	execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%h OUTPUT_VARIABLE UHUB_REVISION_TEMP)
-	if (UHUB_REVISION_TEMP)
-		set (UHUB_REVISION "git-${UHUB_REVISION_TEMP}")
-	endif()
+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 (NOT UHUB_REVISION)
-	set (UHUB_REVISION "release")
-endif()
-
-set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-${UHUB_REVISION}")
-message (STATUS "Current uHub version: ${UHUB_GIT_VERSION}")
-
 if(OPENSSL_FOUND)
 	add_definitions(-DSSL_SUPPORT=1)
 	include_directories(${OPENSSL_INCLUDE_DIR})