diff --git a/device-husky.mk b/device-husky.mk
index e903c5f..be6f0ee 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -402,8 +402,15 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_HUSKY
+TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 32
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=32
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # WLC userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-shiba.mk b/device-shiba.mk
index c227a8a..06e190d 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -379,8 +379,15 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_SHIBA
+TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 32
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=32
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \