diff --git a/config/common.mk b/config/common.mk
index 39e773e8..d183a852 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -124,6 +124,9 @@ ifdef CM_NIGHTLY
     CM_VERSION :=$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD)
 else
     ifdef CM_SNAPSHOT
+        ifdef CM_EXTRAVERSION
+            CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
+        endif
         CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-SNAPSHOT-$(CM_BUILD)$(CM_EXTRAVERSION)
     else
         ifdef CM_RELEASE