diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc16b92..6ca6062 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,15 @@ else()
 	set(GIT_MINOR ${BHL_REPO_VERSION_MINOR})
 	set(GIT_PATCH ${BHL_REPO_VERSION_PATCH})
 	set(GIT_SKIP 0)
-	set(GIT_TAG "v${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}-${BHL_REPO_VERSION_TAG}")
-	set(GIT_SEM_VERSION "${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}-${BHL_REPO_VERSION_TAG}+no-git")
+
+	if( BHL_REPO_VERSION_TAG STREQUAL "" )
+		set(GIT_TAG "v${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}")
+		set(GIT_SEM_VERSION "${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}+no-git")
+	else()
+		set(GIT_TAG "v${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}-${BHL_REPO_VERSION_TAG}")
+		set(GIT_SEM_VERSION "${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}-${BHL_REPO_VERSION_TAG}+no-git")
+	endif()
+
 	message( "Version: ${GIT_SEM_VERSION} (from repo)" )
 endif()