diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 30a86a3c3..d09d6a53c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -166,6 +166,9 @@ TARGET_PER_MGR_ENABLED := true
 # Telephony
 TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
 
+# Peripheral manager
+TARGET_PER_MGR_ENABLED := true
+
 # Wifi
 BOARD_HAS_QCOM_WLAN := true
 BOARD_WLAN_DEVICE := qcwcn
diff --git a/fs_config/file_caps.fs b/fs_config/file_caps.fs
index f076621eb..6a7efee60 100644
--- a/fs_config/file_caps.fs
+++ b/fs_config/file_caps.fs
@@ -25,17 +25,17 @@ group: AID_RADIO
 mode: 0755
 caps: NET_BIND_SERVICE
 
-[system/vendor/bin/pm-service]
-user: AID_SYSTEM
-group: AID_SYSTEM
+[vendor/bin/imsrcsd]
 mode: 0755
-caps: NET_BIND_SERVICE 
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
 
 [vendor/bin/pm-service]
-user: AID_SYSTEM
-group: AID_SYSTEM 
 mode: 0755
-caps: NET_BIND_SERVICE
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE SYS_BOOT
 
 [firmware/]
 mode: 0771
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 8970e9879..26ce358b2 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -495,10 +495,30 @@ on property:ro.hw.revision=*
 on charger
     trigger moto-charger
 
-service per_mgr /system/vendor/bin/pm-service
+service vendor.per_mgr /vendor/bin/pm-service
     class core
     user system
     group system
+    writepid /dev/cpuset/system-background/tasks
+
+service vendor.per_proxy /vendor/bin/pm-proxy
+    class core
+    user system
+    group system
+    disabled
+    writepid /dev/cpuset/system-background/tasks
+
+on property:init.svc.vendor.per_mgr=running
+    start vendor.per_proxy
+
+on property:sys.shutdown.requested=*
+    stop vendor.per_proxy
+
+service ppd /vendor/bin/mm-pp-daemon
+    class hal
+    user system
+    socket pps stream 0660 system system
+    group system graphics
 
 on moto-charger
     setprop ro.board.platform msm8916