diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
index 403e6ec3..09ea2d51 100644
--- a/build/buildtools/commondefs
+++ b/build/buildtools/commondefs
@@ -252,7 +252,7 @@ MACRO_FLAGS += -DFIRM_TARGET_$(FIRM_TARGET)
 #  Makelcf change for build firmware
 #
 ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),)
-MAKELCF			 := $(NITROSDK_ROOT)/tools/bin/makelcf.exe
+MAKELCF			 := $(TWLSDK_ROOT)/tools/bin/makelcf.exe
 endif
 
 #----------------------------------------------------------------------------
diff --git a/build/nandfirm/nandfirm-loader/Makefile b/build/nandfirm/nandfirm-loader/Makefile
index 01e6d268..e947b7a5 100644
--- a/build/nandfirm/nandfirm-loader/Makefile
+++ b/build/nandfirm/nandfirm-loader/Makefile
@@ -20,7 +20,7 @@
 FIRM_TARGET    = FIRM
 
 # if you have no valid key, comment out next line
-#TWL_KEYSDIR = $(FIRM_ROOT)/../twl_firmware/bootrom/build/keys
+TWL_KEYSDIR = $(FIRM_ROOT)/../twl_firmware/bootrom/build/keys
 
 
 #----------------------------------------------------------------------------
diff --git a/build/tools/acsign/Makefile b/build/tools/acsign/Makefile
index 1ed36c37..e50c0959 100644
--- a/build/tools/acsign/Makefile
+++ b/build/tools/acsign/Makefile
@@ -29,7 +29,7 @@ SUBDIRS		=
 #----------------------------------------------------------------------------
 
 SRCDIR		= 	./src
-INCDIR		= 	./include $(NITROSDK_ROOT)/build/libraries/mb/include
+INCDIR		= 	./include $(TWLSDK_ROOT)/build/libraries/mb/include
 
 
 SRCS		=	acsign.c acmemory.c acsign_util.c