diff --git a/RomHeader/012A/libsyscall.a b/RomHeader/012A/libsyscall.a
new file mode 100644
index 00000000..a269a6fb
Binary files /dev/null and b/RomHeader/012A/libsyscall.a differ
diff --git a/RomHeader/012A/rom_header_012a.template.sbin b/RomHeader/012A/rom_header_012a.template.sbin
new file mode 100644
index 00000000..fc33e8ce
Binary files /dev/null and b/RomHeader/012A/rom_header_012a.template.sbin differ
diff --git a/RomHeader/0B4A/libsyscall.a b/RomHeader/0B4A/libsyscall.a
new file mode 100644
index 00000000..261b9899
Binary files /dev/null and b/RomHeader/0B4A/libsyscall.a differ
diff --git a/RomHeader/0B4A/rom_header_0b4a.template.sbin b/RomHeader/0B4A/rom_header_0b4a.template.sbin
new file mode 100644
index 00000000..86197c1e
Binary files /dev/null and b/RomHeader/0B4A/rom_header_0b4a.template.sbin differ
diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu
index d8099bda..77eac772 100644
--- a/build/buildtools/commondefs.sysmenu
+++ b/build/buildtools/commondefs.sysmenu
@@ -23,6 +23,10 @@ NITRO_NO_STD_PCHDR = TRUE # 
 EMPTY	 	?=
 SPACE 		?= $(EMPTY) $(EMPTY)
 
+define toLower
+$(shell echo $(1) | tr '[A-Z]' '[a-z]' )
+endef # toLower
+
 #----------------------------------------------------------------------------
 ### TWL-commondefs
 #
@@ -50,6 +54,9 @@ SYSMENU_INCDIR			:= $(SYSMENU_ROOT)/include \
 SYSMENU_TOOLSDIR		:= $(SYSMENU_ROOT)/tools
 SYSMENU_COMPONENTSDIR	:= $(SYSMENU_ROOT)/components
 
+SYSMENU_ROM_HEADER_DIR	= $(SYSMENU_ROOT)/RomHeader/
+
+
 LDEPENDS_LCF			+= $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu
 LDEPENDS_RES			+= $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu
 
diff --git a/build/tests/FatalErrorMaker/ARM9/Makefile.0 b/build/tests/FatalErrorMaker/ARM9/Makefile.0
index 4b3cb1c8..3208af96 100644
--- a/build/tests/FatalErrorMaker/ARM9/Makefile.0
+++ b/build/tests/FatalErrorMaker/ARM9/Makefile.0
@@ -36,7 +36,8 @@ LINCLUDES		+=	$(MISC_DIR)/include
 
 ROM_SPEC	=	main.rsf
 
-
+ROM_HEADER_TEMPLATE		=	$(SYSMENU_ROM_HEADER_DIR)/$(GAMECODE)/rom_header_$(call toLower,$(GAMECODE)).template.sbin
+LIBSYSCALL				=	$(SYSMENU_ROM_HEADER_DIR)/$(GAMECODE)/libsyscall.a
 
 SYSMENU_LIBS			=	\
 							liblcfg$(TWL_LIBSUFFIX).a \
@@ -69,7 +70,8 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 MAKEROM			=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
 MAKEROM_FLAGS	+=	-DFATALMAKER_GAMECODE=$(GAMECODE)	\
-					-DFATALMAKER_MEDIA=$(MEDIA)
+					-DFATALMAKER_MEDIA=$(MEDIA) \
+					-DROM_HEADER_TEMPLATE='$(call empath,$(ROM_HEADER_TEMPLATE))'
 
 DEFAULT_MAKEROM_ARM7_BASE	= $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
 DEFAULT_MAKEROM_ARM7		= $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
diff --git a/build/tests/FatalErrorMaker/ARM9/Makefile.1 b/build/tests/FatalErrorMaker/ARM9/Makefile.1
index c1ff790d..29934de0 100644
--- a/build/tests/FatalErrorMaker/ARM9/Makefile.1
+++ b/build/tests/FatalErrorMaker/ARM9/Makefile.1
@@ -36,7 +36,8 @@ LINCLUDES		+=	$(MISC_DIR)/include
 
 ROM_SPEC	=	main.rsf
 
-
+ROM_HEADER_TEMPLATE		=	$(SYSMENU_ROM_HEADER_DIR)/$(GAMECODE)/rom_header_$(call toLower,$(GAMECODE)).template.sbin
+LIBSYSCALL				=	$(SYSMENU_ROM_HEADER_DIR)/$(GAMECODE)/libsyscall.a
 
 SYSMENU_LIBS			=	\
 							liblcfg$(TWL_LIBSUFFIX).a \
@@ -69,7 +70,8 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 MAKEROM			=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
 MAKEROM_FLAGS	+=	-DFATALMAKER_GAMECODE=$(GAMECODE)	\
-					-DFATALMAKER_MEDIA=$(MEDIA)
+					-DFATALMAKER_MEDIA=$(MEDIA) \
+					-DROM_HEADER_TEMPLATE='$(call empath,$(ROM_HEADER_TEMPLATE))'
 
 DEFAULT_MAKEROM_ARM7_BASE	= $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
 DEFAULT_MAKEROM_ARM7		= $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
diff --git a/build/tests/FatalErrorMaker/ARM9/main.rsf b/build/tests/FatalErrorMaker/ARM9/main.rsf
index dc0fc39f..db874ff1 100644
--- a/build/tests/FatalErrorMaker/ARM9/main.rsf
+++ b/build/tests/FatalErrorMaker/ARM9/main.rsf
@@ -54,6 +54,9 @@ Property
 	### Settings for FinalROM
 	###
 	#### BEGIN
+	
+	_GameCode		$(FATALMAKER_GAMECODE)
+
 	#
 	# TITLE NAME: Your product name within 12bytes
 	#
@@ -89,7 +92,7 @@ Property
 	#
 	# ROM HEADER TEMPLATE: Provided to every product by NINTENDO
 	#
-	#RomHeaderTemplate	./etc/rom_header.template.sbin
+	RomHeaderTemplate	$(ROM_HEADER_TEMPLATE)
 
 	#
 	# BANNER FILE: generated from Banner Spec File
diff --git a/build/tests/FatalErrorMaker/ARM9/src/fatalErrorMaker.c b/build/tests/FatalErrorMaker/ARM9/src/fatalErrorMaker.c
index ff5baf75..c73b3cc4 100644
--- a/build/tests/FatalErrorMaker/ARM9/src/fatalErrorMaker.c
+++ b/build/tests/FatalErrorMaker/ARM9/src/fatalErrorMaker.c
@@ -325,6 +325,7 @@ static char* s_strFilePath[] = {
 static void
 DumpBinary(u32 offset, void* data, u32 size)
 {
+#pragma unused(data)
     s32     i;
 
     if (size > 0)
diff --git a/build/tests/FatalErrorMaker/banner/banner.bnr b/build/tests/FatalErrorMaker/banner/banner.bnr
index b46fffb3..7faf2304 100644
Binary files a/build/tests/FatalErrorMaker/banner/banner.bnr and b/build/tests/FatalErrorMaker/banner/banner.bnr differ