diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
new file mode 100644
index 00000000..4c25e95f
--- /dev/null
+++ b/build/buildtools/commondefs
@@ -0,0 +1,30 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL - commondefs - common definitions for build system
+# File:     commondefs
+#
+#  Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 2007-09-06$
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+ifndef TWL_IPL_COMMONDEFS_
+TWL_IPL_COMMONDEFS_ = TRUE
+
+
+ifeq	($(TARGET_FIRM),SYSTEMMENU)
+include commondefs.sysmenu
+else
+include commondefs.firm
+endif
+
+#----------------------------------------------------------------------------
+endif	# TWL_IPL_COMMONDEFS_
+#----- End of commondefs -----
diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index 09ea2d51..d8a8d2b7 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -104,7 +104,7 @@ TWL_BUILD_DIR	?= $(FIRM_BUILD_DIR)
 #  TWL-FIRM path settings
 #
 
-FIRM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLFIRM_ROOT)))
+FIRM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLIPL_ROOT)))
 FIRM_BUILDTOOLSDIR	:= $(FIRM_ROOT)/build/buildtools
 FIRM_BUILDSETUPDIR	:= $(FIRM_ROOT)/build/buildsetup
 FIRM_INCDIR			:= $(FIRM_ROOT)/include
@@ -230,7 +230,7 @@ GLIBRARIES		:= $(FIRM_LIBS)   $(GLIBRARIES)
 ifdef	TWLFIRM_INSTALL_ROOT
 TWLFIRM_INSTALL_ROOT_ 	:= $(TWLFIRM_INSTALL_ROOT)
 else
-TWLFIRM_INSTALL_ROOT_ 	:= $(TWLFIRM_ROOT)
+TWLFIRM_INSTALL_ROOT_ 	:= $(TWLIPL_ROOT)
 endif
 
 FIRM_INSTALL_ROOT	:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLFIRM_INSTALL_ROOT_)))
diff --git a/build/buildtools/modulerules b/build/buildtools/modulerules
new file mode 100644
index 00000000..c36b39e1
--- /dev/null
+++ b/build/buildtools/modulerules
@@ -0,0 +1,34 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL - modulerules - common rules for build system
+# File:     modulerules
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 2007-09-06$
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+ifndef TWL_IPL_MODULERULES_
+
+#----------------------------------------------------------------------------
+### TWL-modulerules
+#
+
+ifeq	($(TARGET_FIRM),SYSTEMMENU)
+include modulerules.sysmenu
+else
+include modulerules.firm
+endif
+
+
+#----------------------------------------------------------------------------
+TWL_IPL_MODULERULES_ = TRUE
+endif	# TWL_IPL_MODULERULES_
+#----- End of modulerules -----