diff --git a/device.mk b/device.mk
index 1b421fb..0f29874 100644
--- a/device.mk
+++ b/device.mk
@@ -62,5 +62,8 @@ PRODUCT_COPY_FILES += \
     device/lge/g3-common/wcnss/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     device/lge/g3-common/wcnss/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
+# System properties
+-include $(LOCAL_PATH)/system_prop.mk
+
 # common g3
 $(call inherit-product, device/lge/g3-common/g3.mk)
diff --git a/system.prop b/system.prop
deleted file mode 100644
index dcf4465..0000000
--- a/system.prop
+++ /dev/null
@@ -1,11 +0,0 @@
-# Radio
-persist.radio.do_not_init_csvt=1
-rild.libpath=/vendor/lib/libril-qc-qmi-1.so
-ro.ril.telephony.mqanelements=4
-ro.telephony.call_ring.multiple=0
-ro.telephony.default_network=9
-telephony.lteOnCdmaDevice=0
-telephony.lteOnGsmDevice=1
-
-# Bluetooth
-qcom.bluetooth.soc=smd
diff --git a/system_prop.mk b/system_prop.mk
new file mode 100644
index 0000000..6663ea2
--- /dev/null
+++ b/system_prop.mk
@@ -0,0 +1,17 @@
+#
+# System properties for d855
+#
+
+# Radio
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.radio.do_not_init_csvt=1 \
+    rild.libpath=/vendor/lib/libril-qc-qmi-1.so \
+    ro.ril.telephony.mqanelements=4 \
+    ro.telephony.call_ring.multiple=0 \
+    ro.telephony.default_network=9 \
+    telephony.lteOnCdmaDevice=0 \
+    telephony.lteOnGsmDevice=1
+
+# Bluetooth
+PRODUCT_PROPERTY_OVERRIDES += \
+    qcom.bluetooth.soc=smd