diff --git a/config/version.mk b/config/version.mk
index e6c3fab..6e8b0d6 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -24,8 +24,12 @@
 ifdef BUILDTYPE_RELEASE
 	ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
 else
+ifeq ($(ROM_BUILDTIME_LOCAL),y)
+	ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d-%H%M%z)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
+else
 	ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 endif
+endif
 
 # Apply it to build.prop
 PRODUCT_PROPERTY_OVERRIDES += \