diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4df1948..db3d3e5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,6 +20,8 @@
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_VARIANT := krait
 
+ENABLE_CPUSETS := true
+
 TARGET_NO_BOOTLOADER := true
 
 BOARD_KERNEL_BASE := 0x00000000
diff --git a/init.shamu.rc b/init.shamu.rc
index 63e7144..3dd9ace 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -144,6 +144,12 @@
     chown bluetooth net_bt_stack /sys/devices/platform/msm_serial_hs.0/clock
     chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock
 
+    # update foreground cpuset now that processors are up
+    write /dev/cpuset/foreground/cpus 0-3
+    write /dev/cpuset/foreground/boost/cpus 0-3
+    write /dev/cpuset/background/cpus 0
+    write /dev/cpuset/system-background/cpus 0-1
+
     chmod 0660 /dev/ttyHS2
     chown bluetooth net_bt_stack /dev/ttyHS2
 
@@ -394,6 +400,7 @@
     class core
     user root
     group root
+    writepid /dev/cpuset/system-background/tasks
 
 on property:ro.use_data_netmgrd=false
     # netmgr not supported on specific target
@@ -533,6 +540,7 @@
 service mpdecision /system/bin/mpdecision --avg_comp
    class main
    user root
+   writepid /dev/cpuset/system-background/tasks
 
 service ss_ramdump /system/bin/subsystem_ramdump
     class main