diff --git a/trunk/build/buildtools/modulerules b/trunk/build/buildtools/modulerules
index d5959b9..ef3cd7f 100644
--- a/trunk/build/buildtools/modulerules
+++ b/trunk/build/buildtools/modulerules
@@ -3,7 +3,7 @@
 # Project:  CtrFirm - modulerules - common rules for build system
 # File:     modulerules
 #
-# Copyright 2008 Nintendo.  All rights reserved.
+# Copyright 2008-2009 Nintendo.  All rights reserved.
 #
 # These coded instructions, statements, and computer programs contain
 # proprietary information of Nintendo of America Inc. and/or Nintendo
@@ -24,7 +24,11 @@ ifndef CTRSDK_MODULERULES_
 
 ifneq	($(CTR_FORCE_BUILD),)
 
-VPATH		= $(SRCDIR)
+#VPATH		= $(SRCDIR)
+vpath	%.c		$(SRCDIR)
+vpath	%.cpp	$(SRCDIR)
+vpath	%.cxx	$(SRCDIR)
+vpath	%.s		$(SRCDIR)
 
 SSRCFILES	= $(addprefix $(OBJDIR)/,$(notdir $(SRCS)))
 ASRCFILES	= $(addprefix $(OBJDIR)/,$(notdir $(SRCS_AUTOLOAD)))
diff --git a/trunk/build/buildtools/modulerules.add-ins.firm b/trunk/build/buildtools/modulerules.add-ins.firm
index 38b2954..c8950d0 100644
--- a/trunk/build/buildtools/modulerules.add-ins.firm
+++ b/trunk/build/buildtools/modulerules.add-ins.firm
@@ -3,7 +3,7 @@
 # Project:  CtrFirm - modulerules - common rules for build system
 # File:     modulerules
 #
-# Copyright 2008 Nintendo.  All rights reserved.
+# Copyright 2008-2009 Nintendo.  All rights reserved.
 #
 # These coded instructions, statements, and computer programs contain
 # proprietary information of Nintendo of America Inc. and/or Nintendo
@@ -38,20 +38,6 @@ firmdbg:
 	@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries/os
 	@+$(REMAKE)
 
-# .axf
-$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
-ifeq ($(CTR_CCTYPE),RVCT)
-	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS)
-else
-	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@
-ifeq	($(TWL_PLATFORM),TS)
-	cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef
-endif
-ifdef FIRM_STRIP_AXF
-	$(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin
-endif
-endif
-
 #----------------------------------------------------------------------------
 TWLSDK_MODULERULES_ = TRUE
 endif	# TWLSDK_MODULERULES_
diff --git a/trunk/build/buildtools/modulerules.cctype.RVCT b/trunk/build/buildtools/modulerules.cctype.RVCT
index df0e673..7beee74 100644
--- a/trunk/build/buildtools/modulerules.cctype.RVCT
+++ b/trunk/build/buildtools/modulerules.cctype.RVCT
@@ -124,13 +124,17 @@ endif
 endif
 
 
-# .nef
-ifndef	USE_MY_RULE_NEF
-$(BINDIR)/$(TARGET_BIN_BASENAME).nef: $(OBJS) $(MAKEFILE) $(LDEPENDS_NEF) $(LDRES_FILE) $(ALIBRARIES)
-#	$(LD) $(LDFLAGS) -T $(LCFILE) -LSF $(LCFILE_SPEC) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@
-	$(LD) $(LDFLAGS) -T $(LCFILE) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@
-ifdef	COMPSTATIC_CMDS
-	$(COMPSTATIC) $(COMPSTATIC_CMDS) $(COMPSTATIC_FLAGS) -f $(BINDIR)/component.files $(CTR_STDOUT)
+# .axf
+$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
+ifeq ($(CTR_CCTYPE),RVCT)
+	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS)
+else
+	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@
+ifeq	($(TWL_PLATFORM),TS)
+	cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef
+endif
+ifdef FIRM_STRIP_AXF
+	$(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin
 endif
 endif