diff --git a/build/gcdfirm/sdmc-launcher/ARM9/main.c b/build/gcdfirm/sdmc-launcher/ARM9/main.c
index 9207dff2..acda51fe 100644
--- a/build/gcdfirm/sdmc-launcher/ARM9/main.c
+++ b/build/gcdfirm/sdmc-launcher/ARM9/main.c
@@ -21,15 +21,14 @@ static const u8* rsa_key_user = NULL;   // not acceptable
 static const u8* rsa_key_sys = NULL;    // not acceptable
 static const u8 rsa_key_secure[128] =
 {
-0xda,0x94,0x09,
-0x01,0xd5,0xb7,0xd3,0xc5,0x11,0x46,0x0c,0x41,0x19,0xbc,0x8a,0xba,0xd1,0x56,0x28,
-0x88,0x44,0x07,0x10,0xab,0xc5,0xb8,0xe3,0x06,0xce,0xa6,0x5b,0xe4,0x07,0x52,0xe2,
-0x89,0x85,0x56,0x6d,0xe4,0xcd,0x5c,0xbd,0xfa,0x45,0x75,0xfe,0x58,0x1c,0xe3,0x50,
-0x9e,0x3c,0x67,0x40,0x5e,0x0f,0x46,0x39,0x6a,0x3c,0x48,0x06,0x6e,0xce,0xdd,0x30,
-0x83,0x41,0xb5,0x80,0x4d,0xd9,0xb8,0x64,0xa3,0xf0,0x48,0xc9,0xec,0xac,0xc9,0xcf,
-0xaf,0xf9,0xb6,0x46,0x04,0x49,0x61,0x7b,0xe2,0xa3,0xa7,0x25,0x88,0xd3,0xed,0xa5,
-0xf3,0x76,0x84,0x92,0x00,0x2c,0x96,0xbc,0xb4,0x38,0x9c,0x02,0x56,0x56,0x4f,0xed,
-0xc2,0xa3,0x4e,0x4b,0x88,0x61,0x00,0x03,0x16,0xa5,0x8f,0x57,0x83
+    0xC7, 0x94, 0x50, 0x00, 0x3A, 0xE1, 0x0E, 0x6C, 0xA8, 0xD1, 0xC0, 0x2D, 0x77, 0xB7, 0x6D, 0xBC,
+    0x31, 0xDB, 0x12, 0x08, 0x09, 0x0D, 0x2A, 0xE8, 0xC9, 0x1A, 0x2B, 0x6E, 0x6C, 0x85, 0x78, 0xD7,
+    0x46, 0x50, 0x05, 0xB5, 0xCC, 0x3B, 0xEC, 0xBA, 0xF4, 0xDE, 0xC2, 0x13, 0x13, 0xBE, 0x67, 0xEE,
+    0x85, 0x19, 0xEB, 0x62, 0xB3, 0x5C, 0x09, 0xA8, 0x54, 0x44, 0x26, 0x85, 0x25, 0xEA, 0xE5, 0x85,
+    0xD1, 0xB5, 0xCE, 0xA0, 0xFF, 0x6B, 0x61, 0xCA, 0x94, 0xC1, 0x67, 0xBE, 0xC0, 0x7E, 0x3B, 0xFF,
+    0x12, 0x9B, 0x79, 0xDB, 0xAC, 0xD3, 0x5A, 0x3F, 0x14, 0x37, 0x49, 0xA8, 0x7C, 0x2F, 0x07, 0xF4,
+    0x8B, 0xA9, 0x8B, 0x8D, 0xB2, 0x60, 0xA5, 0xD5, 0x64, 0xEE, 0xCF, 0x3F, 0x32, 0xEE, 0x77, 0xAC,
+    0x27, 0x75, 0x2B, 0x04, 0xD7, 0x26, 0xA8, 0x8A, 0x55, 0x2A, 0x76, 0xE5, 0x68, 0x80, 0x57, 0x85
 };
 #else
 static const u8 rsa_key_user[128] =
diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c
index 24e615b9..5d244ac8 100644
--- a/build/nandfirm/sdmc-launcher/ARM9/main.c
+++ b/build/nandfirm/sdmc-launcher/ARM9/main.c
@@ -26,15 +26,14 @@ static const u8* const rsa_key_user = NULL;   // not acceptable
 static const u8* const rsa_key_sys = NULL;    // not acceptable
 static const u8 rsa_key_secure[128] =
 {
-0xda,0x94,0x09,
-0x01,0xd5,0xb7,0xd3,0xc5,0x11,0x46,0x0c,0x41,0x19,0xbc,0x8a,0xba,0xd1,0x56,0x28,
-0x88,0x44,0x07,0x10,0xab,0xc5,0xb8,0xe3,0x06,0xce,0xa6,0x5b,0xe4,0x07,0x52,0xe2,
-0x89,0x85,0x56,0x6d,0xe4,0xcd,0x5c,0xbd,0xfa,0x45,0x75,0xfe,0x58,0x1c,0xe3,0x50,
-0x9e,0x3c,0x67,0x40,0x5e,0x0f,0x46,0x39,0x6a,0x3c,0x48,0x06,0x6e,0xce,0xdd,0x30,
-0x83,0x41,0xb5,0x80,0x4d,0xd9,0xb8,0x64,0xa3,0xf0,0x48,0xc9,0xec,0xac,0xc9,0xcf,
-0xaf,0xf9,0xb6,0x46,0x04,0x49,0x61,0x7b,0xe2,0xa3,0xa7,0x25,0x88,0xd3,0xed,0xa5,
-0xf3,0x76,0x84,0x92,0x00,0x2c,0x96,0xbc,0xb4,0x38,0x9c,0x02,0x56,0x56,0x4f,0xed,
-0xc2,0xa3,0x4e,0x4b,0x88,0x61,0x00,0x03,0x16,0xa5,0x8f,0x57,0x83
+    0xC7, 0x94, 0x50, 0x00, 0x3A, 0xE1, 0x0E, 0x6C, 0xA8, 0xD1, 0xC0, 0x2D, 0x77, 0xB7, 0x6D, 0xBC,
+    0x31, 0xDB, 0x12, 0x08, 0x09, 0x0D, 0x2A, 0xE8, 0xC9, 0x1A, 0x2B, 0x6E, 0x6C, 0x85, 0x78, 0xD7,
+    0x46, 0x50, 0x05, 0xB5, 0xCC, 0x3B, 0xEC, 0xBA, 0xF4, 0xDE, 0xC2, 0x13, 0x13, 0xBE, 0x67, 0xEE,
+    0x85, 0x19, 0xEB, 0x62, 0xB3, 0x5C, 0x09, 0xA8, 0x54, 0x44, 0x26, 0x85, 0x25, 0xEA, 0xE5, 0x85,
+    0xD1, 0xB5, 0xCE, 0xA0, 0xFF, 0x6B, 0x61, 0xCA, 0x94, 0xC1, 0x67, 0xBE, 0xC0, 0x7E, 0x3B, 0xFF,
+    0x12, 0x9B, 0x79, 0xDB, 0xAC, 0xD3, 0x5A, 0x3F, 0x14, 0x37, 0x49, 0xA8, 0x7C, 0x2F, 0x07, 0xF4,
+    0x8B, 0xA9, 0x8B, 0x8D, 0xB2, 0x60, 0xA5, 0xD5, 0x64, 0xEE, 0xCF, 0x3F, 0x32, 0xEE, 0x77, 0xAC,
+    0x27, 0x75, 0x2B, 0x04, 0xD7, 0x26, 0xA8, 0x8A, 0x55, 0x2A, 0x76, 0xE5, 0x68, 0x80, 0x57, 0x85
 };
 #else
 #if 0
diff --git a/build/systemMenu_mastering/Makefile b/build/systemMenu_mastering/Makefile
index 7f317e05..e8272157 100644
--- a/build/systemMenu_mastering/Makefile
+++ b/build/systemMenu_mastering/Makefile
@@ -64,7 +64,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
 do-build :	$(TARGETS)
 
-MASTERING =	$(SYSMENU_TOOLSDIR)/bin/mastering.TWL.exe
+MASTERING =	$(TWL_IPL_RED_PRIVATE_ROOT)/build/tools/mastering.TWL/mastering.TWL.exe
 
 
 #---------------------------
@@ -151,7 +151,7 @@ $(OUT_DIR)/menu_launcher-$(TWL_BUILD_TYPE).nand: ../nandfirm/menu-launcher/menu_
 #---------------------------
 $(OUT_DIR)/$(NAND_INITIALIZER_NAME)-$(TWL_BUILD_TYPE)$(MASTER).srl: ../systemMenu_tools/$(NAND_INITIALIZER_NAME)/ARM9.TWL/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/$(NAND_INITIALIZER_NAME).srl
 ifneq ($(DO_MASTERING),)
-	$(MASTERING) $< $@
+	$(MASTERING) -s $< $@
 else
 	cp $< $@
 endif