diff --git a/device.mk b/device.mk
index b7b531b..b52974b 100644
--- a/device.mk
+++ b/device.mk
@@ -31,7 +31,7 @@ PRODUCT_PACKAGES += \
 
 # Features
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml
 
 # Camera
 PRODUCT_PACKAGES += \
diff --git a/rootdir/etc/init.deb.rc b/rootdir/etc/init.deb.rc
index 2fa3761..f4b8bd3 100644
--- a/rootdir/etc/init.deb.rc
+++ b/rootdir/etc/init.deb.rc
@@ -222,17 +222,17 @@ on post-fs-data
 
     setprop vold.post_fs_data_done 1
 
-service irsc_util /system/bin/irsc_util "/etc/sec_config"
+service irsc_util /vendor/bin/irsc_util "/etc/sec_config"
     class main
     user root
     oneshot
 
-service rmt_storage /system/bin/rmt_storage
+service rmt_storage /vendor/bin/rmt_storage
     class main
     user root
     group system wakelock
 
-service hciattach /system/bin/init.flo.bt.sh
+service hciattach /vendor/bin/init.flo.bt.sh
     class late_start
     user bluetooth
     group qcom_oncrpc bluetooth system
@@ -246,23 +246,23 @@ on property:bluetooth.hciattach=true
 on property:bluetooth.hciattach=false
     setprop bluetooth.status off
 
-service bridgemgrd /system/bin/bridgemgrd
+service bridgemgrd /vendor/bin/bridgemgrd
     class main
     user radio
     group radio
 
 # QMUX must be in multiple groups to support external process connections
-service qmuxd /system/bin/qmuxd
+service qmuxd /vendor/bin/qmuxd
     class main
     user root
     group radio audio bluetooth wakelock gps
 
-service ks_checker /system/bin/kickstart_checker.sh
+service ks_checker /vendor/bin/kickstart_checker.sh
     class core
     group system
     oneshot
 
-service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
+service kickstart /vendor/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
     class core
     user system
     group system wakelock
@@ -279,7 +279,7 @@ on property:gsm.radio.kickstart=off
 on property:ril.asus_debugger_running=1
     start asus-dbug-d
 
-service netmgrd /system/bin/netmgrd
+service netmgrd /vendor/bin/netmgrd
     class main
     group radio wakelock
 
@@ -291,7 +291,7 @@ service ril-daemon /vendor/bin/hw/rild
     user root
     group radio cache inet misc audio log readproc wakelock qcom_diag net_raw
 
-service sensors /system/bin/sensors.qcom
+service sensors /vendor/bin/sensors.qcom
     class late_start
     user root
     group root wakelock
@@ -319,37 +319,37 @@ service charger /sbin/healthd -c
     critical
     seclabel u:r:healthd:s0
 
-service thermald /system/bin/thermald
+service thermald /vendor/bin/thermald
     class main
     group radio system
 
-service mpdecision /system/bin/mpdecision --avg_comp
+service mpdecision /vendor/bin/mpdecision --avg_comp
     class main
     user root
     group root readproc system
 
-service qcamerasvr /system/bin/mm-qcamera-daemon
+service qcamerasvr /vendor/bin/mm-qcamera-daemon
     class late_start
     user camera
     group camera system inet input
 
-service wcnss_init /system/bin/init.flo.wifi.sh
+service wcnss_init /vendor/bin/init.flo.wifi.sh
     class late_start
     user system
     group system wifi
     oneshot
 
-service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
+service bdAddrLoader /vendor/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
     class main
     user bluetooth
     group system bluetooth
     oneshot
 
-service qseecomd /system/bin/qseecomd
+service qseecomd /vendor/bin/qseecomd
     class late_start
     user system
     group system
 
-service diag_mdlog /system/bin/diag_mdlog -s 100
+service diag_mdlog /vendor/bin/diag_mdlog -s 100
     class late_start
     disabled