diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82b17d7e..d41f8a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,12 +109,13 @@ else()
 endif()
 
 string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
-set (SYNERGY_SNAPSHOT_INFO ".b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}")
 
 if (SYNERGY_VERSION_STAGE STREQUAL "git")
-    set (SYNERGY_VERSION_TAG "unstable")
+    set (SYNERGY_SNAPSHOT_INFO ".unstable.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}")
+    set (SYNERGY_VERSION_TAG "unstable.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 else()
-    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}")
+    set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 endif()
 
 set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")