diff --git a/RomHeader/0F0A/libsyscall.a b/RomHeader/0F0A/libsyscall.a
new file mode 100644
index 00000000..80f1cd6a
Binary files /dev/null and b/RomHeader/0F0A/libsyscall.a differ
diff --git a/RomHeader/0F0A/rom_header_0f0a.template.sbin b/RomHeader/0F0A/rom_header_0f0a.template.sbin
new file mode 100644
index 00000000..d8f48581
Binary files /dev/null and b/RomHeader/0F0A/rom_header_0f0a.template.sbin differ
diff --git a/RomHeader/0F1A/libsyscall.a b/RomHeader/0F1A/libsyscall.a
new file mode 100644
index 00000000..e18fb6e2
Binary files /dev/null and b/RomHeader/0F1A/libsyscall.a differ
diff --git a/RomHeader/0F1A/rom_header_0f1a.template.sbin b/RomHeader/0F1A/rom_header_0f1a.template.sbin
new file mode 100644
index 00000000..ccf724a4
Binary files /dev/null and b/RomHeader/0F1A/rom_header_0f1a.template.sbin differ
diff --git a/RomHeader/0F2A/libsyscall.a b/RomHeader/0F2A/libsyscall.a
new file mode 100644
index 00000000..a78273ad
Binary files /dev/null and b/RomHeader/0F2A/libsyscall.a differ
diff --git a/RomHeader/0F2A/rom_header_0f2a.template.sbin b/RomHeader/0F2A/rom_header_0f2a.template.sbin
new file mode 100644
index 00000000..a8ae581f
Binary files /dev/null and b/RomHeader/0F2A/rom_header_0f2a.template.sbin differ
diff --git a/RomHeader/0F3A/libsyscall.a b/RomHeader/0F3A/libsyscall.a
new file mode 100644
index 00000000..55ba233b
Binary files /dev/null and b/RomHeader/0F3A/libsyscall.a differ
diff --git a/RomHeader/0F3A/rom_header_0f3a.template.sbin b/RomHeader/0F3A/rom_header_0f3a.template.sbin
new file mode 100644
index 00000000..0d0ac6e9
Binary files /dev/null and b/RomHeader/0F3A/rom_header_0f3a.template.sbin differ
diff --git a/RomHeader/0F4A/libsyscall.a b/RomHeader/0F4A/libsyscall.a
new file mode 100644
index 00000000..22c5ccef
Binary files /dev/null and b/RomHeader/0F4A/libsyscall.a differ
diff --git a/RomHeader/0F4A/rom_header_0f4a.template.sbin b/RomHeader/0F4A/rom_header_0f4a.template.sbin
new file mode 100644
index 00000000..ce37dc09
Binary files /dev/null and b/RomHeader/0F4A/rom_header_0f4a.template.sbin differ
diff --git a/RomHeader/0F5A/libsyscall.a b/RomHeader/0F5A/libsyscall.a
new file mode 100644
index 00000000..552eb718
Binary files /dev/null and b/RomHeader/0F5A/libsyscall.a differ
diff --git a/RomHeader/0F5A/rom_header_0f5a.template.sbin b/RomHeader/0F5A/rom_header_0f5a.template.sbin
new file mode 100644
index 00000000..ee72bb91
Binary files /dev/null and b/RomHeader/0F5A/rom_header_0f5a.template.sbin differ
diff --git a/RomHeader/0F6A/libsyscall.a b/RomHeader/0F6A/libsyscall.a
new file mode 100644
index 00000000..cbb901da
Binary files /dev/null and b/RomHeader/0F6A/libsyscall.a differ
diff --git a/RomHeader/0F6A/rom_header_0f6a.template.sbin b/RomHeader/0F6A/rom_header_0f6a.template.sbin
new file mode 100644
index 00000000..ffbe3906
Binary files /dev/null and b/RomHeader/0F6A/rom_header_0f6a.template.sbin differ
diff --git a/RomHeader/0F7A/libsyscall.a b/RomHeader/0F7A/libsyscall.a
new file mode 100644
index 00000000..459cae4c
Binary files /dev/null and b/RomHeader/0F7A/libsyscall.a differ
diff --git a/RomHeader/0F7A/rom_header_0f7a.template.sbin b/RomHeader/0F7A/rom_header_0f7a.template.sbin
new file mode 100644
index 00000000..4698cccb
Binary files /dev/null and b/RomHeader/0F7A/rom_header_0f7a.template.sbin differ
diff --git a/RomHeader/0F8A/libsyscall.a b/RomHeader/0F8A/libsyscall.a
new file mode 100644
index 00000000..dea8efa5
Binary files /dev/null and b/RomHeader/0F8A/libsyscall.a differ
diff --git a/RomHeader/0F8A/rom_header_0f8a.template.sbin b/RomHeader/0F8A/rom_header_0f8a.template.sbin
new file mode 100644
index 00000000..2770775d
Binary files /dev/null and b/RomHeader/0F8A/rom_header_0f8a.template.sbin differ
diff --git a/RomHeader/0F9A/libsyscall.a b/RomHeader/0F9A/libsyscall.a
new file mode 100644
index 00000000..6f695c28
Binary files /dev/null and b/RomHeader/0F9A/libsyscall.a differ
diff --git a/RomHeader/0F9A/rom_header_0f9a.template.sbin b/RomHeader/0F9A/rom_header_0f9a.template.sbin
new file mode 100644
index 00000000..f19ef3a7
Binary files /dev/null and b/RomHeader/0F9A/rom_header_0f9a.template.sbin differ
diff --git a/RomHeader/0FAA/libsyscall.a b/RomHeader/0FAA/libsyscall.a
new file mode 100644
index 00000000..3e9e07d4
Binary files /dev/null and b/RomHeader/0FAA/libsyscall.a differ
diff --git a/RomHeader/0FAA/rom_header_0faa.template.sbin b/RomHeader/0FAA/rom_header_0faa.template.sbin
new file mode 100644
index 00000000..92555e53
Binary files /dev/null and b/RomHeader/0FAA/rom_header_0faa.template.sbin differ
diff --git a/RomHeader/0FBA/libsyscall.a b/RomHeader/0FBA/libsyscall.a
new file mode 100644
index 00000000..f0e13768
Binary files /dev/null and b/RomHeader/0FBA/libsyscall.a differ
diff --git a/RomHeader/0FBA/rom_header_0fba.template.sbin b/RomHeader/0FBA/rom_header_0fba.template.sbin
new file mode 100644
index 00000000..de0a8c5f
Binary files /dev/null and b/RomHeader/0FBA/rom_header_0fba.template.sbin differ
diff --git a/RomHeader/0FCA/libsyscall.a b/RomHeader/0FCA/libsyscall.a
new file mode 100644
index 00000000..5a0b0369
Binary files /dev/null and b/RomHeader/0FCA/libsyscall.a differ
diff --git a/RomHeader/0FCA/rom_header_0fca.template.sbin b/RomHeader/0FCA/rom_header_0fca.template.sbin
new file mode 100644
index 00000000..8d91fdbf
Binary files /dev/null and b/RomHeader/0FCA/rom_header_0fca.template.sbin differ
diff --git a/RomHeader/0FDA/libsyscall.a b/RomHeader/0FDA/libsyscall.a
new file mode 100644
index 00000000..a1194d4f
Binary files /dev/null and b/RomHeader/0FDA/libsyscall.a differ
diff --git a/RomHeader/0FDA/rom_header_0fda.template.sbin b/RomHeader/0FDA/rom_header_0fda.template.sbin
new file mode 100644
index 00000000..1a68c0be
Binary files /dev/null and b/RomHeader/0FDA/rom_header_0fda.template.sbin differ
diff --git a/RomHeader/0FEA/libsyscall.a b/RomHeader/0FEA/libsyscall.a
new file mode 100644
index 00000000..d7579e50
Binary files /dev/null and b/RomHeader/0FEA/libsyscall.a differ
diff --git a/RomHeader/0FEA/rom_header_0fea.template.sbin b/RomHeader/0FEA/rom_header_0fea.template.sbin
new file mode 100644
index 00000000..5ea8a441
Binary files /dev/null and b/RomHeader/0FEA/rom_header_0fea.template.sbin differ
diff --git a/build/tests/Makefile b/build/tests/Makefile
index 99f470f3..6f7c69f0 100644
--- a/build/tests/Makefile
+++ b/build/tests/Makefile
@@ -20,7 +20,7 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS		=	RelocateChecker
+
 
 #----------------------------------------------------------------------------
 
diff --git a/build/tests/RomTypeTest/ARM9/src/RomTypeTest.c b/build/tests/RomTypeTest/ARM9/src/RomTypeTest.c
index 834231d0..0f77a0a7 100644
--- a/build/tests/RomTypeTest/ARM9/src/RomTypeTest.c
+++ b/build/tests/RomTypeTest/ARM9/src/RomTypeTest.c
@@ -261,7 +261,7 @@ static AccessPermission RWTestCore( char *path, char *testfile )
 		FSResult fs_result = FS_GetArchiveResultCode( filename );
 		if( !s_quiettest ) OS_TPrintf("%s:cleate failed.\n",filename);
 		OS_TPrintf( "FS_GetArchiveResultCode(%s) : %d\n", filename, fs_result );
-		if( FS_RESULT_NO_ENTRY == fs_result )
+		if( FS_RESULT_ERROR == fs_result )
 		{
 			// ファイル作成にNO_ENTRY＝存在しないディレクトリの下にファイルを作ろうとしたかマウントされていない
 			// どちらにせよアクセスできないし、ディレクトリの存在を確認する事もできないので、パーミッションNAとして扱う
diff --git a/build/tests/TestMaker/Makefile b/build/tests/TestMaker/Makefile
index 12f396a0..f8164b42 100644
--- a/build/tests/TestMaker/Makefile
+++ b/build/tests/TestMaker/Makefile
@@ -209,13 +209,14 @@ ROM_SPEC	=	twl_$(GAMECODE).rsf
 
 INSTALL_TARGETS	= $(BINDIR)/$(TARGET_BIN)
 
+include $(GAMECODE).param
+
 ifeq ($(USE_IPL_RED_LIB),TRUE)
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 else
 include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 include	$(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
 endif
-include $(GAMECODE).param
 
 # boottestの時だけARM7コンポーネントの指定
 # このあたりの指定が苦肉すぎるので妙案募集中
diff --git a/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml b/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml
index 7cd596e1..ab6b8888 100644
Binary files a/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml and b/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml differ
diff --git a/build/tests/TestMaker/script/config.py b/build/tests/TestMaker/script/config.py
index 459fbaf9..f6b1840c 100644
--- a/build/tests/TestMaker/script/config.py
+++ b/build/tests/TestMaker/script/config.py
@@ -54,9 +54,9 @@ for num in romparam.keys():
         if romparam[num][rsfkey].get('AppType') == 'SYSTEM':
             #----- MAKEROM 縺ｮ謖�螳�
             if romparam[num][rsfkey]['Secure']:
-                codeparam.write('MAKEROM           := $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe\n')
+                codeparam.write('override MAKEROM           = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe\n')
             else:
-                codeparam.write('MAKEROM           := $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe\n')
+                codeparam.write('override MAKEROM           = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe\n')
             codeparam.write('MAKETAD_OPTION    += -s\n')
             romspectemplate = '$(ROOT)/include/twl/specfiles/ROM-TS_sys.rsf'
         else:
@@ -69,6 +69,11 @@ for num in romparam.keys():
             romspectemplate = romparam[num][optkey].get('RomSpecTemplate')
         codeparam.write(''.join(['ROM_SPEC_TEMPLATE  = ',romspectemplate,'\n']))
 
+        #----- ROM_HEADER_TEMPLATE縺翫ｈ縺ｳLIBSYSCALL縺ｮ謖�螳�
+        if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader'):
+            codeparam.write(''.join(['ROM_HEADER_TEMPLATE = $(SYSMENU_ROM_HEADER_DIR)',gamecode,'/rom_header_$(call toLower,',gamecode,').template.sbin\n']))
+            codeparam.write(''.join(['LIBSYSCALL = $(SYSMENU_ROM_HEADER_DIR)',gamecode,'/libsyscall.a\n']))
+
         #----- ROM_SPEC_OPTIONS key 縺ｮ謚ｽ蜃ｺ
         if romparam[num][rsfkey].get('AppType') == 'SYSTEM':
             keys = [key for key in romparam[num][rsfkey].keys() if key != 'TitleType' and key != 'eTicket' ]
@@ -104,6 +109,9 @@ for num in romparam.keys():
         #----- Rating 髢｢騾｣ ROM_SPEC_OPTIONS
         if romparam[num].has_key(ratingkey):
             rsf_opt.append('%s=%s '%(romparam[num][ratingkey]['Ogn'],str(romparam[num][ratingkey]['Age'])))
+        #----- RomHeaderTemplate縺ｮ謖�螳�
+        if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader'):
+            rsf_opt.append('RomHeaderTemplate=$(call empath,$(ROM_HEADER_TEMPLATE)) ')
         #----- ROM_SPEC_OPTIONS 縺ｮ謖�螳�
         rsf_opt_str = ''.join(rsf_opt)
         codeparam.write('ROM_SPEC_PARAM   = %s\n' % rsf_opt_str)