diff --git a/etc/init.rc b/etc/init.rc
index b26d2ae..9d1da1d 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -38,6 +38,9 @@
 
     class_start default
 
+on property:sys.powerctl=*
+   powerctl ${sys.powerctl}
+
 service ueventd /sbin/ueventd
     critical
 
diff --git a/recovery.cpp b/recovery.cpp
index 654a665..b783393 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1062,6 +1062,6 @@
     // Otherwise, get ready to boot the main system...
     finish_recovery(send_intent);
     ui->Print("Rebooting...\n");
-    android_reboot(ANDROID_RB_RESTART, 0, 0);
+    property_set(ANDROID_RB_PROPERTY, "");
     return EXIT_SUCCESS;
 }