diff --git a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
index a1140bb3..55f159db 100644
--- a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
+++ b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
@@ -16,37 +16,6 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS		=	$(LAUNCHER_DIR) \
-				$(MACHINESETTINGS_DIR) \
-				$(WLANFIRM_DIR)
-
-
-#----------------------------------------------------------------------------
-
-#============================================================================
-
-LAUNCHER_DIR				=	../../Launcher
-MACHINESETTINGS_DIR			=	../../MachineSettings
-WLANFIRM_DIR				=	../../wlanfirm
-
-
-# COMPILE SWITCH　for build SystemMenu
-
-export UPDATER_RELEASE		=	TRUE
-
-export DO_NOT_SHOW_LAUNCHER	=	TRUE
-export DISABLE_WDS_SCAN		=	TRUE
-export DISABLE_WLFIRM_LOAD	=	FALSE
-export DISABLE_SLEEP		=	TRUE
-export LOAD_APP_VIA_WRAM	=	FALSE
-
-# MAKEROM SWITCH for build SystemMenu
-export DISABLE_DEBUG		=	TRUE
-export ENABLE_AES			=	TRUE
-
-
-#============================================================================
-
 #============================================================================
 #現時点で製品鍵を使った書き込みが行えてはダメなので、デフォルトOFFにしておいてください。
 #USE_PRODUCT_KEY			=	TRUE
diff --git a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/src/main.c b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/src/main.c
index 0f40c190..a9b0be05 100644
--- a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/src/main.c
+++ b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/src/main.c
@@ -33,9 +33,9 @@
 
 static const char* ImportTadFileList[] =
 {
-	"rom:/data/HNAA.Release.updater.tad",
-	"rom:/data/HNBA.Release.updater.tad",
-	"rom:/data/HNCA.updater.tad"
+	"rom:/data/HNAA.tad",
+	"rom:/data/HNBA.tad",
+	"rom:/data/HNCA.tad"
 };
 
 static const char* NandFirmPath = "rom:/data/menu_launcher-RELEASE.nand";
diff --git a/build/systemMenu_RED/SystemUpdater/Makefile b/build/systemMenu_RED/SystemUpdater/Makefile
index 9ef7476b..01737168 100644
--- a/build/systemMenu_RED/SystemUpdater/Makefile
+++ b/build/systemMenu_RED/SystemUpdater/Makefile
@@ -21,9 +21,33 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS =	ARM7.TWL \
+LAUNCHER_DIR				=	../Launcher
+MACHINESETTINGS_DIR			=	../MachineSettings
+WLANFIRM_DIR				=	../wlanfirm
+NANDFIRM_DIR                =   ../../nandfirm/menu-launcher
+
+SUBDIRS =	$(LAUNCHER_DIR) \
+			$(MACHINESETTINGS_DIR) \
+			$(WLANFIRM_DIR) \
+			$(NANDFIRM_DIR) \
+			data \
+			ARM7.TWL \
 			ARM9.TWL
 
+# COMPILE SWITCH for build SystemMenu
+
+export UPDATER_RELEASE		=	TRUE
+
+export DO_NOT_SHOW_LAUNCHER	=	TRUE
+export DISABLE_WDS_SCAN		=	TRUE
+export DISABLE_WLFIRM_LOAD	=	FALSE
+export DISABLE_SLEEP		=	TRUE
+export LOAD_APP_VIA_WRAM	=	FALSE
+
+# MAKEROM SWITCH for build SystemMenu
+export DISABLE_DEBUG		=	TRUE
+export ENABLE_AES			=	TRUE
+
 #----------------------------------------------------------------------------
 
 include	$(TWLSDK_ROOT)/build/buildtools/modulerules
diff --git a/build/systemMenu_RED/SystemUpdater/data/HNAA.Release.updater.tad b/build/systemMenu_RED/SystemUpdater/data/HNAA.Release.updater.tad
deleted file mode 100644
index 3d869e98..00000000
Binary files a/build/systemMenu_RED/SystemUpdater/data/HNAA.Release.updater.tad and /dev/null differ
diff --git a/build/systemMenu_RED/SystemUpdater/data/HNBA.Release.updater.tad b/build/systemMenu_RED/SystemUpdater/data/HNBA.Release.updater.tad
deleted file mode 100644
index aa394e89..00000000
Binary files a/build/systemMenu_RED/SystemUpdater/data/HNBA.Release.updater.tad and /dev/null differ
diff --git a/build/systemMenu_RED/SystemUpdater/data/HNCA.updater.tad b/build/systemMenu_RED/SystemUpdater/data/HNCA.updater.tad
deleted file mode 100644
index 679d33cb..00000000
Binary files a/build/systemMenu_RED/SystemUpdater/data/HNCA.updater.tad and /dev/null differ
diff --git a/build/systemMenu_RED/SystemUpdater/data/Makefile b/build/systemMenu_RED/SystemUpdater/data/Makefile
new file mode 100644
index 00000000..b179f481
--- /dev/null
+++ b/build/systemMenu_RED/SystemUpdater/data/Makefile
@@ -0,0 +1,57 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile -
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 
+# $Rev: 
+# $Author: 
+#----------------------------------------------------------------------------
+
+TARGET_FIRM				=	SYSTEMMENU
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+
+#----------------------------------------------------------------------------
+MAKETAD			= $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
+
+
+#INSTALL_TARGETS		=	HNCA.tad
+#INSTALL_DIR		=	$(ROOT)/build/tools/TwlNMenu/data
+
+LDIRT_CLEAN		=	HNAA.tad \
+					HNBA.tad \
+					HNCA.tad \
+					menu_launcher-RELEASE.nand
+
+#----------------------------------------------------------------------------
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+do-build :	HNAA.tad \
+			HNBA.tad \
+			HNCA.tad \
+			menu_launcher-RELEASE.nand
+			
+HNAA.tad: ../../Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/main.srl
+	$(MAKETAD) -s $< $(MAKETAD_FLAGS) -o $@
+
+HNBA.tad: ../../MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/main.srl
+	$(MAKETAD) -s $< $(MAKETAD_FLAGS) -o $@
+
+HNCA.tad: ../../wlanfirm/HNCA.srl
+	$(MAKETAD) -s $< $(MAKETAD_FLAGS) -o $@
+
+menu_launcher-RELEASE.nand: ../../../nandfirm/menu-launcher/menu_launcher-RELEASE.nand
+	cp $< .
+
+#===== End of Makefile =====
diff --git a/build/systemMenu_RED/SystemUpdater/data/menu_launcher-RELEASE.nand b/build/systemMenu_RED/SystemUpdater/data/menu_launcher-RELEASE.nand
deleted file mode 100644
index 31ae0478..00000000
Binary files a/build/systemMenu_RED/SystemUpdater/data/menu_launcher-RELEASE.nand and /dev/null differ