diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index cc3f078ddf..7ad96da79b 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -3349,11 +3349,7 @@ int hello_main(int argc, char *argv[])
     </p>
   <li>
     <p>
-      And finally, the <code>apps/examples/Makefile</code>will execute the <i>context</i> target in all configured <code>example</code>sub-directores, getting us finally to <code>apps/examples/Makefile</code> (which is covered below).</p>
-  <li>
-    <p>
-      At the conclusion of the <i>context</i> phase, the <code> apps/Makefile</code> will touch a file called <code>.context</code> in the <code>apps/</code> directory, preventing any further configurations during any subsequent <i>context</i> phase build attempts.
-    </p>
+      And finally, the <code>apps/examples/Makefile</code> will execute the <i>context</i> target in all configured <code>example</code>sub-directores, getting us finally to <code>apps/examples/Makefile</code> which is covered below.</p>
 </ol>
 
 <p>
@@ -3417,9 +3413,8 @@ STACKSIZE       = 2048
       When the <code>hello</code> command is executed, it will start the task with entry point <code>hello_main()</code> with the default priority and with a stack size of 2K.
    </p>
 <ul><pre>
-.context:
+context:
   $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
-  @touch $@
 </pre></ul>
 </ol>
 
diff --git a/configs/vsn/src/Makefile b/configs/vsn/src/Makefile
index a71c80c8ab..b0eba0a20b 100644
--- a/configs/vsn/src/Makefile
+++ b/configs/vsn/src/Makefile
@@ -85,11 +85,14 @@ libboard$(LIBEXT): $(OBJS)
 
 # Register application
 
-.context:
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(TOPDIR)$(DELIM).config Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
-	$(Q) touch $@
 
-context: .context
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
+context:
+endif
 
 # Create dependencies