diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2b0f690..2ac7c83 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -45,6 +45,9 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 
+# Properties
+TARGET_VENDOR_PROP += $(DEVICE_PATH)/device.prop
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
 
diff --git a/device.mk b/device.mk
index 95bf191..ebe1d97 100644
--- a/device.mk
+++ b/device.mk
@@ -22,9 +22,6 @@ DEVICE_PATH := device/motorola/sanders
 DEVICE_PACKAGE_OVERLAYS += \
     $(DEVICE_PATH)/overlay
 
-# Device properties
-$(call inherit-product, $(DEVICE_PATH)/device_prop.mk)
-
 # Screen density
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 PRODUCT_AAPT_CONFIG := normal
diff --git a/device.prop b/device.prop
new file mode 100644
index 0000000..07df0fe
--- /dev/null
+++ b/device.prop
@@ -0,0 +1,22 @@
+#
+# vendor props for sanders
+#
+
+# Audio
+persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb
+persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb
+persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb
+persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb
+persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb
+persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Handset_cal.acdb
+persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_cal.acdb
+
+# Camera
+persist.vendor.camera.expose.aux=1
+ro.camera.cfa.packagelist=org.codeaurora.snapcam,com.motorola.camera2
+vendor.camera.aux.packagelist=com.motorola.camera2
+persist.camera.HAL3.enabled=1
+persist.camera.eis.enable=1
+
+# Sensors
+ro.hardware.sensors=sanders
diff --git a/device_prop.mk b/device_prop.mk
deleted file mode 100644
index dbf7905..0000000
--- a/device_prop.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# vendor props for sanders
-#
-
-# Audio
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
-    persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb \
-    persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb \
-    persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
-    persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
-    persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Handset_cal.acdb \
-    persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_cal.acdb
-
-# Camera
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.camera.expose.aux=1 \
-    ro.camera.cfa.packagelist=org.codeaurora.snapcam,com.motorola.camera2 \
-    vendor.camera.aux.packagelist=com.motorola.camera2 \
-    persist.camera.HAL3.enabled=1 \
-    persist.camera.eis.enable=1
-
-# Sensors
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.sensors=sanders