diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm
index 79b3acc7..2b3062e3 100644
--- a/build/buildtools/modulerules.firm
+++ b/build/buildtools/modulerules.firm
@@ -41,9 +41,9 @@ MAKEFIRM_DEFS	+= -DFIRM_ROOT='$(FIRM_ROOT)' \
 				-DMAKEFIRM_RSA_PRVKEY='$(MAKEFIRM_RSA_PRVKEY)' \
 
 ifdef TWL_KEYSDIR
-MAKEFIRM_FLAGS	+= -t'$(TWL_KEYSDIR)/blowfish/gcdfirm_header_twlj.template.sbin'
+MAKEGCDFIRM_FLAGS	+= -t'$(TWL_KEYSDIR)/blowfish/gcdfirm_header_twlj.template.sbin'
 else
-MAKEFIRM_FLAGS	+= -t'$(FIRM_ROOT)/build/tools/makegcdfirm/gcdfirm_header_twlj.template.sbin'
+MAKEGCDFIRM_FLAGS	+= -t'$(FIRM_ROOT)/build/tools/makegcdfirm/gcdfirm_header_twlj.template.sbin'
 endif
 
 FIRM_SDEPENDS_BIN	= $(MAKEFIRM_RSA_PRVKEY) $(MAKEFIRM_ARM9) $(MAKEFIRM_ARM7)
@@ -67,7 +67,7 @@ $(BINDIR)/%.nand: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_B
 
 # .gcd
 $(BINDIR)/%.gcd: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKEGCDFIRM)
-	$(MAKEGCDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
+	$(MAKEGCDFIRM) $(MAKEFIRM_FLAGS) $(MAKEGCDFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .rbin
 $(BINDIR)/$(TARGET_BIN_BASENAME).rbin: $(OBJS)