diff --git a/rootdir/init.rc b/rootdir/init.rc
index b475728c4..0fa9febdd 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -797,6 +797,9 @@ on property:vold.decrypt=trigger_shutdown_framework
 
 on property:sys.boot_completed=1
     bootchart stop
+    # Setup per_boot directory so other .rc could start to use it on boot_completed
+    exec - system system -- /bin/rm -rf /data/per_boot
+    mkdir /data/per_boot 0700 system system
 
 # system server cannot write to /proc/sys files,
 # and chown/chmod does not work for /proc/sys/ entries.