diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8b46fc5..af18927 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -102,6 +102,4 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 
 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
-
-#BOARD_USES_RECOVERY_CHARGEMODE := true
-BOARD_HAS_LARGE_FILESYSTEM := true
+TARGET_RECOVERY_INITRC := device/htc/leo/prebuilt/recovery/init.htc.rc
diff --git a/leo.mk b/leo.mk
index 255b676..03d2d2f 100755
--- a/leo.mk
+++ b/leo.mk
@@ -88,7 +88,15 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
 
+# recovery utilities
+PRODUCT_COPY_FILES += \
+    device/htc/leo/prebuilt/recovery/choice_fn:recovery/root/sbin/choice_fn \
+    device/htc/leo/prebuilt/recovery/detect_key:recovery/root/sbin/detect_key \
+    device/htc/leo/prebuilt/recovery/htcbatt:recovery/root/sbin/htcbatt \
+    device/htc/leo/prebuilt/recovery/offmode_charging:recovery/root/sbin/offmode_charging \
+    device/htc/leo/prebuilt/recovery/power_test:recovery/root/sbin/power_test
 
+# kernel modules
 PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \
     device/htc/leo/prebuilt/modules/cifs.ko:system/lib/modules/cifs.ko \
@@ -97,6 +105,7 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/modules/tun.ko:system/lib/modules/tun.ko \
     device/htc/leo/prebuilt/modules/fuse.ko:system/lib/modules/fuse.ko
 
+# kernel
 PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/kernel:boot/zImage \
 
diff --git a/prebuilt/recovery/choice_fn b/prebuilt/recovery/choice_fn
new file mode 100755
index 0000000..aa79c0a
Binary files /dev/null and b/prebuilt/recovery/choice_fn differ
diff --git a/prebuilt/recovery/detect_key b/prebuilt/recovery/detect_key
new file mode 100755
index 0000000..ebf5ec2
Binary files /dev/null and b/prebuilt/recovery/detect_key differ
diff --git a/prebuilt/recovery/htcbatt b/prebuilt/recovery/htcbatt
new file mode 100644
index 0000000..d6ddec3
Binary files /dev/null and b/prebuilt/recovery/htcbatt differ
diff --git a/prebuilt/recovery/init.htc.rc b/prebuilt/recovery/init.htc.rc
new file mode 100644
index 0000000..cf794ae
--- /dev/null
+++ b/prebuilt/recovery/init.htc.rc
@@ -0,0 +1,59 @@
+on early-init
+    start ueventd
+
+on init
+    export PATH /sbin
+    export ANDROID_ROOT /system
+    export ANDROID_DATA /data
+    export EXTERNAL_STORAGE /sdcard
+
+    symlink /system/etc /etc
+
+    mkdir /boot
+    mkdir /sdcard
+    mkdir /sd-ext
+    mkdir /datadata
+    mkdir /emmc
+    mkdir /system
+    mkdir /data
+    mkdir /cache
+    mount /tmp /tmp tmpfs
+
+on boot
+
+    ifup lo
+    hostname localhost
+    domainname localdomain
+
+    class_start default
+
+service ueventd /sbin/ueventd
+    critical
+
+service choice_fn /sbin/choice_fn
+    oneshot
+
+service recovery /sbin/recovery
+
+service power_test /sbin/power_test
+    disabled
+    oneshot
+
+service offmode_charging /sbin/offmode_charging
+    disabled
+    oneshot
+
+service detect_key /sbin/detect_key
+    disabled
+    oneshot
+
+service htcbatt /sbin/htcbatt
+    oneshot
+
+service adbd /sbin/adbd recovery
+
+on property:persist.service.adb.enable=1
+    start adbd
+
+on property:persist.service.adb.enable=0
+    stop adbd
diff --git a/prebuilt/recovery/offmode_charging b/prebuilt/recovery/offmode_charging
new file mode 100755
index 0000000..5937612
Binary files /dev/null and b/prebuilt/recovery/offmode_charging differ
diff --git a/prebuilt/recovery/power_test b/prebuilt/recovery/power_test
new file mode 100755
index 0000000..7cbb171
Binary files /dev/null and b/prebuilt/recovery/power_test differ