diff --git a/device.mk b/device.mk
index 8521fd404d10ba3429e61487985a3de8ebc640d2..bcfee076dca2aa8b092fff6857dc2eb6ca62feb0 100644
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,9 @@
 # Vendor blobs
 $(call inherit-product-if-exists, vendor/motorola/evert/evert-vendor.mk)
 
+# Properties
+-include $(LOCAL_PATH)/vendor_prop.mk
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
diff --git a/vendor.prop b/vendor.prop
deleted file mode 100644
index 48d87042545a2ad0809750217094fa7cd37c36e1..0000000000000000000000000000000000000000
--- a/vendor.prop
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# vendor.prop for evert
-#
-
-# Audio ACDB
-persist.audio.calfile0=/vendor/etc/acdbdata/common/Bluetooth_cal.acdb
-persist.audio.calfile1=/vendor/etc/acdbdata/common/General_cal.acdb
-persist.audio.calfile2=/vendor/etc/acdbdata/common/Global_cal.acdb
-persist.audio.calfile3=/vendor/etc/acdbdata/common/Handset_cal.acdb
-persist.audio.calfile4=/vendor/etc/acdbdata/common/Hdmi_cal.acdb
-persist.audio.calfile5=/vendor/etc/acdbdata/common/Headset_cal.acdb
-persist.audio.calfile6=/vendor/etc/acdbdata/common/Speaker_cal.acdb
-
-# Sensors
-ro.vendor.sensors.dev_ori=true
-ro.vendor.sensors.sta_detect=true
-ro.vendor.sensors.mot_detect=true
-ro.vendor.sensors.facing=false
-ro.vendor.sensors.cmc=false
-ro.vendor.sdk.sensors.gestures=false
-
-ro.hardware.sensors=evert
-ro.vendor.sensors.maghalcal=true
-ro.vendor.sensors.pmd=false
-ro.vendor.sensors.amd=false
-ro.vendor.sensors.rmd=false
-ro.vendor.sensors.facing=false
-ro.vendor.sensors.scrn_ortn=false
-ro.vendor.sensors.pedometer=false
diff --git a/vendor_prop.mk b/vendor_prop.mk
new file mode 100644
index 0000000000000000000000000000000000000000..f2bd81db7d8bd8dc402a7dc0a97e3b17721ec5ee
--- /dev/null
+++ b/vendor_prop.mk
@@ -0,0 +1,29 @@
+#
+# vendor props for evert
+#
+
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.audio.calfile0=/vendor/etc/acdbdata/common/Bluetooth_cal.acdb \
+    persist.audio.calfile1=/vendor/etc/acdbdata/common/General_cal.acdb \
+    persist.audio.calfile2=/vendor/etc/acdbdata/common/Global_cal.acdb \
+    persist.audio.calfile3=/vendor/etc/acdbdata/common/Handset_cal.acdb \
+    persist.audio.calfile4=/vendor/etc/acdbdata/common/Hdmi_cal.acdb \
+    persist.audio.calfile5=/vendor/etc/acdbdata/common/Headset_cal.acdb \
+    persist.audio.calfile6=/vendor/etc/acdbdata/common/Speaker_cal.acdb
+
+# Sensors
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.sensors=evert \
+    ro.vendor.sensors.maghalcal=true \
+    ro.vendor.sensors.amd=false \
+    ro.vendor.sensors.pmd=false \
+    ro.vendor.sensors.rmd=false \
+    ro.vendor.sensors.facing=false \
+    ro.vendor.sensors.scrn_ortn=false \
+    ro.vendor.sensors.pedometer=false \
+    ro.vendor.sensors.dev_ori=true \
+    ro.vendor.sensors.sta_detect=true \
+    ro.vendor.sensors.mot_detect=true \
+    ro.vendor.sensors.cmc=false \
+    ro.vendor.sdk.sensors.gestures=false