diff --git a/Android.mk b/Android.mk
index 9ec1301..34c092d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@ LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 
-BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE
+BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE TARGET_RECOVERY_PRE_COMMAND
 
 $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
   $(if $($(board_define)), \
diff --git a/extendedcommands.c b/extendedcommands.c
index 06a230f..86d1f4a 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -885,7 +885,10 @@ void show_advanced_menu()
         switch (chosen_item)
         {
             case 0:
-                reboot_wrapper("recovery");
+#ifdef TARGET_RECOVERY_PRE_COMMAND
+                __system(TARGET_RECOVERY_PRE_COMMAND);
+#endif
+                __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, "recovery");
                 break;
             case 1:
             {
diff --git a/nandroid.c b/nandroid.c
index ae10ca8..af97e86 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -101,7 +101,7 @@ typedef void (*file_event_callback)(const char* filename);
 typedef int (*nandroid_backup_handler)(const char* backup_path, const char* backup_file_image, int callback);
 
 static int mkyaffs2image_wrapper(const char* backup_path, const char* backup_file_image, int callback) {
-    return mkyaffs2image(backup_path, backup_file_image, 0, callback);
+    return mkyaffs2image(backup_path, backup_file_image, 0, callback ? yaffs_callback : NULL);
 }
 
 static int tar_compress_wrapper(const char* backup_path, const char* backup_file_image, int callback) {