2 files changed, 14 insertions, 7 deletions

diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 9edcc42a0..024d7c67a 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -33,20 +33,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "led.h"
 #include "command.h"
 #include "backlight.h"
+#include "quantum.h"
 
 #ifdef MOUSEKEY_ENABLE
 #include "mousekey.h"
 #endif
 
 #ifdef PROTOCOL_PJRC
-#   include "usb_keyboard.h"
-#   ifdef EXTRAKEY_ENABLE
-#       include "usb_extra.h"
-#   endif
+        #include "usb_keyboard.h"
+                #ifdef EXTRAKEY_ENABLE
+                #include "usb_extra.h"
+        #endif
 #endif
 
 #ifdef PROTOCOL_VUSB
-#   include "usbdrv.h"
+        #include "usbdrv.h"
 #endif
 
 #ifdef AUDIO_ENABLE
@@ -358,7 +359,7 @@ static bool command_common(uint8_t code)
             print("\n\nJumping to bootloader... ");
             #ifdef AUDIO_ENABLE
                     stop_all_notes();
-                play_goodbye_tone();
+                shutdown_user();
             #else
                     _delay_ms(1000);
             #endif
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 552f32331..1d384574f 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -366,7 +366,13 @@ ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
 
 
 # Default target.
-all: begin gccversion sizebefore build sizeafter end
+all: 
+        $(MAKE) begin 
+        $(MAKE) gccversion 
+        $(MAKE) sizebefore 
+        $(MAKE) build 
+        $(MAKE) sizeafter 
+        $(MAKE) end
 
 # Change the build target to build a HEX file or a library.
 build: elf hex eep lss sym