Index: sources/update/VSwUpdate.cpp
===================================================================
diff -u -r7e905e51f1651ef329a9b121e31f9c22d3d898d2 -r61c46e9379ca82d826fbe7fae018b8362a107d9d
--- sources/update/VSwUpdate.cpp	(.../VSwUpdate.cpp)	(revision 7e905e51f1651ef329a9b121e31f9c22d3d898d2)
+++ sources/update/VSwUpdate.cpp	(.../VSwUpdate.cpp)	(revision 61c46e9379ca82d826fbe7fae018b8362a107d9d)
@@ -37,11 +37,10 @@
 #define REBOOT_ENABLED (0)
 #endif
 
-#define MSG_ID_ENTER_BOOTLOADER_NOW  (0x808F)    ///< HD Jump to the bootloader application
-#define MSG_ID_REBOOT_NOW            (0x8090)    ///< HD Reboot RM46 immediately
-#define MSG_ID_SET_ENTER_BOOTLOADER  (0x8091)    ///< HD Set the flag to stay
+#define MSG_ID_ENTER_BOOTLOADER_NOW  (0x8093)    ///< HD Jump to the bootloader application
+#define MSG_ID_REBOOT_NOW            (0x8094)    ///< HD Reboot RM46 immediately
+#define MSG_ID_SET_ENTER_BOOTLOADER  (0x8095)    ///< HD Set the flag to stay
 
-
 /*!
  * \brief   Constructor.
  *
@@ -300,8 +299,9 @@
                 // This is the only point in an update that can fail and just go to the existing image.
                 // Because we didn't write MSG_ID_HD_SET_ENTER_BOOTLOADER this should reboot to the app.
                 //
-                // TODO: Don't have a good recovery for this ...
-                sendAppCommand(MSG_ID_REBOOT_NOW);
+                // This should put both into the FW bootloader, which timesout into launching the app if
+                // nothing else is commanded.
+                _package.rebootFW();
 
                 set_progress("Failed to start " + QString::fromStdString(_available[row_index].fileName));
                 writeLog("Failed to start " + QString::fromStdString(package_location), false);