diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
index 1b374cb1..2b293d02 100644
--- a/build/buildtools/commondefs
+++ b/build/buildtools/commondefs
@@ -20,9 +20,16 @@ TWLFIRM_COMMONDEFS_ = TRUE
 
 NITRO_NO_STD_PCHDR = TRUE # プリコンパイルヘッダ抑止
 
-export TWLBROM_ROOT := $(TWLFIRM_ROOT)/bootrom
+ifndef TWL_KEYSDIR
+DUMMY_KEYS_SUFFIX	=	.dummykey
+endif
+TWL_KEYSDIR			?=	$(FIRM_ROOT)/keys/dummy
 
 
+ifneq ($(filter NORFIRM NANDFIRM GCDFIRM,$(FIRM_TARGET)),)
+TARGET_BIN			?=	$(TARGET_FIRM:.nor=$(DUMMY_KEYS_SUFFIX).nor)
+endif
+
 EMPTY	 	?=
 SPACE 		?= $(EMPTY) $(EMPTY)
 
@@ -93,14 +100,6 @@ TWL_BUILD_DIR	?= $(FIRM_BUILD_DIR)
 
 
 
-#----------------------------------------------------------------------------
-#  BROM-SDK path settings
-#
-
-BROM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLBROM_ROOT)))
-BROM_KEYSDIR		:= $(BROM_ROOT)/build/keys
-
-
 #----------------------------------------------------------------------------
 #  TWL-FIRM path settings
 #
diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile
index 66b5207c..ddf84245 100644
--- a/build/norfirm/norfirm-empty/Makefile
+++ b/build/norfirm/norfirm-empty/Makefile
@@ -22,12 +22,11 @@ FIRM_TARGET    = NORFIRM
 
 include	$(TWLFIRM_ROOT)/build/buildtools/commondefs
 
-
 #----------------------------------------------------------------------------
 
 SUBDIRS =	\
 
-TARGET_BIN		=	norfirm_empty.nor
+TARGET_FIRM		=	norfirm_empty.nor
 BINDIR			=	.
 MAKEFIRM_RSA_PRVKEY	= $(TWL_KEYSDIR)/rsa/private_nor.der
 
@@ -40,6 +39,9 @@ NITRO_MAKEROM	=	TRUE
 MAKEFIRM_FLAGS	+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
+LDIRT_CLEAN		+=	$(BINDIR)/$(TARGET_BIN) \
+					rsa_public.sbin \
+
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGET_BIN)
diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile
index 0882ebe9..b1407929 100644
--- a/build/norfirm/norfirm-print/Makefile
+++ b/build/norfirm/norfirm-print/Makefile
@@ -30,7 +30,7 @@ SUBDIRS =	\
             ARM9 \
             wram_regs \
 
-TARGET_BIN		=	norfirm_print.nor
+TARGET_FIRM		=	norfirm_print.nor
 BINDIR			=	.
 MAKEFIRM_ARM9	=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf
 MAKEFIRM_ARM7	=	ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.axf
@@ -41,6 +41,9 @@ NITRO_MAKEROM	=	TRUE
 MAKEFIRM_FLAGS	+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
+LDIRT_CLEAN		+=	$(BINDIR)/$(TARGET_BIN) \
+					rsa_public.sbin \
+
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGET_BIN)
diff --git a/keys/dummy/rsa/private_gcd.der b/keys/dummy/rsa/private_gcd.der
new file mode 100644
index 00000000..91e7fe42
Binary files /dev/null and b/keys/dummy/rsa/private_gcd.der differ
diff --git a/keys/dummy/rsa/private_nand.der b/keys/dummy/rsa/private_nand.der
new file mode 100644
index 00000000..771e3bf3
Binary files /dev/null and b/keys/dummy/rsa/private_nand.der differ
diff --git a/keys/dummy/rsa/private_nor.der b/keys/dummy/rsa/private_nor.der
new file mode 100644
index 00000000..2f3aba7b
Binary files /dev/null and b/keys/dummy/rsa/private_nor.der differ
diff --git a/keys/dummy/rsa/pubkey_gcd.der b/keys/dummy/rsa/pubkey_gcd.der
new file mode 100644
index 00000000..b9cc07d1
Binary files /dev/null and b/keys/dummy/rsa/pubkey_gcd.der differ
diff --git a/keys/dummy/rsa/pubkey_nand.der b/keys/dummy/rsa/pubkey_nand.der
new file mode 100644
index 00000000..cbd2740d
Binary files /dev/null and b/keys/dummy/rsa/pubkey_nand.der differ
diff --git a/keys/dummy/rsa/pubkey_nor.der b/keys/dummy/rsa/pubkey_nor.der
new file mode 100644
index 00000000..3c3999eb
Binary files /dev/null and b/keys/dummy/rsa/pubkey_nor.der differ