diff --git a/config/version.mk b/config/version.mk
index 63330a8..7f0ebe1 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -20,13 +20,18 @@
 	ROM_BUILDTYPE := HOMEMADE
 endif
 
+TARGET_PRODUCT_SHORT := $(TARGET_PRODUCT)
+TARGET_PRODUCT_SHORT := $(subst omni_,,$(TARGET_PRODUCT_SHORT))
+
 # Build the final version string
 ifdef BUILDTYPE_RELEASE
-	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(TARGET_PRODUCT)
+	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(TARGET_PRODUCT_SHORT)
 else
-	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT)-$(ROM_BUILDTYPE)
+	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 endif
 
 # Apply it to build.prop
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.modversion=$(ROM_VERSION)
+	ro.modversion=OmniROM-$(ROM_VERSION) \
+	ro.omni.version=$(ROM_VERSION)
+