diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 8999047ef1..09a4f634d1 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -440,8 +440,11 @@
 	  files.  It makes sense for 'leaf' Makefiles to have this dependency,
 	  but it does not make sense for upper-level Makefiles.
 	* namedapp/: Renamed to builtins in preparation for another change.
-	* .context:  Removed the .context kludge.  This causes lots of problems
+	* .context:  Removed the .context kludge.  This caused lots of problems
 	  when changing configurations because there is no easy way to get the
 	  system to rebuild the context.  Now, the context will be rebuilt
 	  whenever there is a change in either .config or the Makefile.
+	* builtin/registry:  Updated new built-in registration logic to handle
+	  cases where (1) old apps/.config is used, and (2) applications ared
+	  removed, not just added.
 
diff --git a/apps/Make.defs b/apps/Make.defs
index 217137a29c..c62999804c 100644
--- a/apps/Make.defs
+++ b/apps/Make.defs
@@ -36,6 +36,12 @@
 
 BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
 
+ifeq ($(CONFIG_NUTTX_NEWCONFIG),y)
+DEPCONFIG = $(TOPDIR)/.config
+else
+DEPCONFIG = $(TOPDIR)/.config $(APPDIR)/.config
+endif
+
 define REGISTER
 	$(Q) echo "Register: $1"
 	$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
diff --git a/apps/builtin/Makefile b/apps/builtin/Makefile
index 6633146e93..2d8b0193ed 100644
--- a/apps/builtin/Makefile
+++ b/apps/builtin/Makefile
@@ -96,6 +96,7 @@ endif
 	$(Q) touch .built
 
 context:
+	$(Q) $(MAKE) -C registry context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 .depend: Makefile $(SRCS)
 	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@@ -104,6 +105,7 @@ context:
 depend: .depend
 
 clean:
+	$(Q) $(MAKE) -C registry clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 	$(call DELFILE, .built)
 	$(call CLEAN)
 
diff --git a/apps/builtin/registry/Makefile b/apps/builtin/registry/Makefile
index 9117f53d6e..4ecd5da9fa 100644
--- a/apps/builtin/registry/Makefile
+++ b/apps/builtin/registry/Makefile
@@ -41,7 +41,14 @@ include $(APPDIR)/Make.defs
 all:
 .PHONY: context depend clean distclean
 
-context:
+.updated: $(DEPCONFIG)
+	$(call DELFILE, *.bdat)
+	$(call DELFILE, *.pdat)
+	$(Q) touch .updated
+
+# This must run before any other context target
+
+context: .updated
 
 depend:
 
diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile
index 55bc259e4b..3cbe843f6f 100644
--- a/apps/examples/adc/Makefile
+++ b/apps/examples/adc/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/buttons/Makefile b/apps/examples/buttons/Makefile
index ac1f2f05aa..a2e8679d49 100644
--- a/apps/examples/buttons/Makefile
+++ b/apps/examples/buttons/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/can/Makefile b/apps/examples/can/Makefile
index 5df96e1e7d..548c6702c1 100644
--- a/apps/examples/can/Makefile
+++ b/apps/examples/can/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/cdcacm/Makefile b/apps/examples/cdcacm/Makefile
index d9e19e9064..2cf3a107fa 100644
--- a/apps/examples/cdcacm/Makefile
+++ b/apps/examples/cdcacm/Makefile
@@ -88,10 +88,10 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
 
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
diff --git a/apps/examples/composite/Makefile b/apps/examples/composite/Makefile
index b1fe493082..1f05d9c647 100644
--- a/apps/examples/composite/Makefile
+++ b/apps/examples/composite/Makefile
@@ -88,10 +88,10 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
 
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
diff --git a/apps/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile
index cba9f0a4f0..97fdb6edee 100644
--- a/apps/examples/cxxtest/Makefile
+++ b/apps/examples/cxxtest/Makefile
@@ -101,7 +101,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile
index 0522d4cc47..d718d79e13 100644
--- a/apps/examples/dhcpd/Makefile
+++ b/apps/examples/dhcpd/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/discover/Makefile b/apps/examples/discover/Makefile
index b0285fbff3..033ab11313 100644
--- a/apps/examples/discover/Makefile
+++ b/apps/examples/discover/Makefile
@@ -85,7 +85,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/ftpc/Makefile b/apps/examples/ftpc/Makefile
index e09779abdf..cc966f8d6b 100644
--- a/apps/examples/ftpc/Makefile
+++ b/apps/examples/ftpc/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile
index dc53bfdeab..dd18d5043b 100644
--- a/apps/examples/ftpd/Makefile
+++ b/apps/examples/ftpd/Makefile
@@ -79,10 +79,10 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,ftpd_start,SCHED_PRIORITY_DEFAULT,2048,ftpd_start)
 
-$(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,2048,ftpd_stop)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat
diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index c4e6f735a5..fc98fa7f45 100644
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile
index df1b360a50..44d8806583 100644
--- a/apps/examples/helloxx/Makefile
+++ b/apps/examples/helloxx/Makefile
@@ -101,7 +101,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/json/Makefile b/apps/examples/json/Makefile
index 1e42757b86..f6a38fb1a1 100644
--- a/apps/examples/json/Makefile
+++ b/apps/examples/json/Makefile
@@ -82,7 +82,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/keypadtest/Makefile b/apps/examples/keypadtest/Makefile
index 0c40a5c6c1..e38e66a822 100644
--- a/apps/examples/keypadtest/Makefile
+++ b/apps/examples/keypadtest/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/lcdrw/Makefile b/apps/examples/lcdrw/Makefile
index 61d6bcce6e..aab04acf5e 100644
--- a/apps/examples/lcdrw/Makefile
+++ b/apps/examples/lcdrw/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/modbus/Makefile b/apps/examples/modbus/Makefile
index da31c3b524..b2fba6764e 100644
--- a/apps/examples/modbus/Makefile
+++ b/apps/examples/modbus/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index e6f56e7659..a0308713c1 100644
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -117,7 +117,7 @@ $(HOST_BIN): $(HOST_OBJS)
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile
index 4474a58c3f..13a9388219 100644
--- a/apps/examples/nx/Makefile
+++ b/apps/examples/nx/Makefile
@@ -87,7 +87,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile
index 52ced123d5..4a72eb8c7b 100644
--- a/apps/examples/nxhello/Makefile
+++ b/apps/examples/nxhello/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nximage/Makefile b/apps/examples/nximage/Makefile
index 98f04c2d53..7bdaa46d23 100644
--- a/apps/examples/nximage/Makefile
+++ b/apps/examples/nximage/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile
index 9673a5520d..54495b2924 100644
--- a/apps/examples/nxlines/Makefile
+++ b/apps/examples/nxlines/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/nxtext/Makefile b/apps/examples/nxtext/Makefile
index 738209754f..dfb165608d 100644
--- a/apps/examples/nxtext/Makefile
+++ b/apps/examples/nxtext/Makefile
@@ -88,7 +88,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile
index dfb500387a..3d19f6a780 100644
--- a/apps/examples/ostest/Makefile
+++ b/apps/examples/ostest/Makefile
@@ -128,7 +128,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_OSTEST_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/pwm/Makefile b/apps/examples/pwm/Makefile
index d33d1c2775..ece901a993 100644
--- a/apps/examples/pwm/Makefile
+++ b/apps/examples/pwm/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/qencoder/Makefile b/apps/examples/qencoder/Makefile
index 1caff2ed30..9668796e67 100644
--- a/apps/examples/qencoder/Makefile
+++ b/apps/examples/qencoder/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/relays/Makefile b/apps/examples/relays/Makefile
index 17bf7a6a4b..1ab4c87167 100644
--- a/apps/examples/relays/Makefile
+++ b/apps/examples/relays/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile
index 63876baa03..4391870c0a 100644
--- a/apps/examples/telnetd/Makefile
+++ b/apps/examples/telnetd/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile
index 853e904a73..17b3bb92cf 100644
--- a/apps/examples/tiff/Makefile
+++ b/apps/examples/tiff/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile
index 8761cc5b50..1a65c7282d 100644
--- a/apps/examples/touchscreen/Makefile
+++ b/apps/examples/touchscreen/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/usbstorage/Makefile b/apps/examples/usbstorage/Makefile
index a1eb77836e..6c486bf9c4 100644
--- a/apps/examples/usbstorage/Makefile
+++ b/apps/examples/usbstorage/Makefile
@@ -88,10 +88,10 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
 
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile
index 3b3ca6cd7f..91e80686e2 100644
--- a/apps/examples/usbterm/Makefile
+++ b/apps/examples/usbterm/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/watchdog/Makefile b/apps/examples/watchdog/Makefile
index cf947b0119..076272fe36 100644
--- a/apps/examples/watchdog/Makefile
+++ b/apps/examples/watchdog/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/wgetjson/Makefile b/apps/examples/wgetjson/Makefile
index 38bd8ac04f..89cb3e11e4 100644
--- a/apps/examples/wgetjson/Makefile
+++ b/apps/examples/wgetjson/Makefile
@@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/examples/xmlrpc/Makefile b/apps/examples/xmlrpc/Makefile
index 4756bfabbb..b103fd7edc 100644
--- a/apps/examples/xmlrpc/Makefile
+++ b/apps/examples/xmlrpc/Makefile
@@ -85,7 +85,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 4f6424f50d..58ca7956c3 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -93,7 +93,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index 7f42801a9f..1ed7a2faef 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -81,7 +81,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index aa65e60edd..07d42887a5 100644
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -94,7 +94,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile
index 0067a13abe..eb7518fbcc 100644
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -94,7 +94,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile
index 1c92398f32..b47781095d 100644
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -94,7 +94,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile
index 6c580ba868..d748b2b04f 100644
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -94,7 +94,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile
index d233aa3d80..eb788b01ac 100644
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -94,7 +94,7 @@ $(COBJS): %$(OBJEXT): %.c
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat