diff --git a/config/common.mk b/config/common.mk
index 2e372ddc..68b02e69 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -100,10 +100,10 @@ PRODUCT_VERSION_MAINTENANCE = 0-RC0
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=IML74K
 
 ifdef CM_NIGHTLY
-    CM_VERSION :=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(CM_BUILD)
+    CM_VERSION :=$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD)
 else
     ifdef CM_SNAPSHOT
-        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-SNAPSHOT-$(CM_BUILD)$(CM_EXTRAVERSION)
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-SNAPSHOT-$(CM_BUILD)$(CM_EXTRAVERSION)
     else
         ifdef CM_RELEASE
             CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)