diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index b9fe6a7b..7460b2fc 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -24,7 +24,7 @@ SPACE 		?= $(EMPTY) $(EMPTY)
 ifndef TWL_KEYSDIR
 DUMMY_KEYS_SUFFIX	=	.dummykey
 endif
-TWL_KEYSDIR		?=	$(FIRM_ROOT)/keys/firm/dummy
+TWL_KEYSDIR		?=	$(FIRM_ROOT)/keys/rsa/dummy
 
 TARGET_BIN		?=	$(subst .,$(DUMMY_KEYS_SUFFIX).,$(TARGET_FIRM_BIN))
 
diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu
index 4abbbfac..996011b2 100644
--- a/build/buildtools/commondefs.sysmenu
+++ b/build/buildtools/commondefs.sysmenu
@@ -23,6 +23,8 @@ NITRO_NO_STD_PCHDR = TRUE # 
 EMPTY	 	?=
 SPACE 		?= $(EMPTY) $(EMPTY)
 
+TWL_KEYSDIR		?=	$(SYSMENU_ROOT)/keys/rsa/dummy
+
 #----------------------------------------------------------------------------
 #  TWL-SYSTEM-MENU path settings
 #
diff --git a/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf b/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
index dc3e55db..df21378b 100644
--- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
+++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
@@ -104,11 +104,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf
index 625d2777..66c7df1e 100644
--- a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf
+++ b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf
@@ -104,11 +104,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index 2cb15d0b..83016139 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -26,6 +26,8 @@ SUBDIRS					=	\
 
 #----------------------------------------------------------------------------
 
+#FIRM_BUILD				=	TRUE
+
 TARGET_FIRM				=	SYSTEMMENU
 TARGET_PLATFORM			=	TWL
 TWL_ARCHGEN				=	LIMITED
@@ -61,6 +63,12 @@ ADDRESS_DTCM			=	0x0e000000
 DEFAULT_COMP_ARM7		=	hyena
 
 MAKEROM_FLAGS			+=	-F -DTITLEID_LO='$(TITLEID_LO)'
+ifdef FIRM_BUILD
+MAKEROM_FLAGS			+=	-f \
+							-DFIRM_PRIV_KEY=$(TWL_KEYSDIR)/rsa/private9_0.der \
+							-DFIRM_PUB_KEY=$(TWL_KEYSDIR)/rsa/public9_0.der
+endif
+
 MAKETAD_FLAGS			+= -s
 
 include	$(TWLSDK_ROOT)/add-ins/es/commondefs.es
diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf
index 837cfa37..3b0b883f 100644
--- a/build/systemMenu_RED/Launcher/ARM9/main.rsf
+++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf
@@ -105,11 +105,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
index 96435b92..659fd928 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
+++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
@@ -104,11 +104,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/systemMenu_RED/PictoChat/ARM9/main.rsf b/build/systemMenu_RED/PictoChat/ARM9/main.rsf
index 96435b92..659fd928 100644
--- a/build/systemMenu_RED/PictoChat/ARM9/main.rsf
+++ b/build/systemMenu_RED/PictoChat/ARM9/main.rsf
@@ -104,11 +104,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf
index b6043b6c..884a71fe 100644
--- a/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf
+++ b/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf
@@ -106,12 +106,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-	#Certificate		./my_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf
index 1897cb03..0ebcbf4b 100644
--- a/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf
+++ b/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf
@@ -106,12 +106,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-	#Certificate		./my_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf
index b6043b6c..884a71fe 100644
--- a/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf
+++ b/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf
@@ -106,12 +106,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-	#Certificate		./my_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/tests/ExecPreLoadedApp/ARM9/main.rsf b/build/tests/ExecPreLoadedApp/ARM9/main.rsf
index 6cba2afe..33e030fe 100644
--- a/build/tests/ExecPreLoadedApp/ARM9/main.rsf
+++ b/build/tests/ExecPreLoadedApp/ARM9/main.rsf
@@ -105,11 +105,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/build/tests/RelocateChecker/ARM9/main.rsf b/build/tests/RelocateChecker/ARM9/main.rsf
index 0f941667..b00baaa9 100644
--- a/build/tests/RelocateChecker/ARM9/main.rsf
+++ b/build/tests/RelocateChecker/ARM9/main.rsf
@@ -104,11 +104,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#
diff --git a/include/firm/specfiles/ROM-TS-FIRM.rsf b/include/firm/specfiles/ROM-TS-FIRM.rsf
index 419a27be..fc1a8a6f 100644
--- a/include/firm/specfiles/ROM-TS-FIRM.rsf
+++ b/include/firm/specfiles/ROM-TS-FIRM.rsf
@@ -105,11 +105,6 @@ Property
 	#
 	BannerTWLFile	$(TWLSDK_ROOT)/include/twl/specfiles/default.bnr
 
-	#
-	# Certification FILE:
-	#
-	Certificate		$(TWLSDK_ROOT)/include/twl/specfiles/default_sgn.sbin
-
 	#
 	# Digest parameters:
 	#