diff --git a/ChangeLog b/ChangeLog
index 5bec7c5ad79..d0db0c5f115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1553,7 +1553,7 @@
 	* configs/olimex-lpc1766stk/slip-httpd - An example that uses SLIP to
 	  provide a serial-port based THTTPD web server.
 
-5.20 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+6.0 2011-03-21 Gregory Nutt <spudmonkey@racsa.co.cr>
 
 	* lib/lib_fopen() -- fopen() was not returning the correct errno value
 	  when the underlying open() failed.
@@ -1587,7 +1587,7 @@
 	  incorporate code taken from the Linux kernel.  That changes the
 	  licensing on this module to GPL.  To avoid licensing contamination,
 	  this driver was moved to misc/drivers/rtl8187x *prior* to adding
-	  and of the GPL log.  There is an INSTALL.sh script at the location
+	  any of the GPL logic.  There is an INSTALL.sh script at the location
 	  where the GPL driver(s) can be re-installed into the NuttX source
 	  tree.  By re-installing the driver, you agree to the GPL licsensing
 	  and all of its implications.
@@ -1595,11 +1595,14 @@
 	  configs/<board>/<config>/appdir to apps/.config and to simply the
 	  application configuration logic.
 	* examples/nsh and apps/nshlib - Move the core NuttShell (NSH) logic
-	  out of the exemples directory and into the apps/directory where
+	  out of the exemples directory and into the apps/ directory where
 	  it belongs.
 	* apps/Makefile and configs/*/appconfig - Use '=' as the delimiter
 	  instead of '/' so that sub-directories in apps/ can be used.
 	* apps/vsn - Move all VSN apps to apps/vsn.
 	* nuttx/examples moved to apps/examples
 
+6.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+
+
 	  
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 6929f54e1c2..c8e89dc6868 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: March 20, 2011</p>
+      <p>Last Updated: March 21, 2011</p>
     </td>
   </tr>
 </table>
@@ -807,77 +807,68 @@
   </tr>
 </table>
 
-<p><b>nuttx-5.19 Release Notes</b>:
+<p><b>nuttx-6.0 Release Notes</b>:
 
 <p>
-  The 66<sup>th</sup> release of NuttX, Version 5.19, was made on March 12, 2011 and is available for download from the
+  The 67<sup>th</sup> release of NuttX, Version 6.0, was made on March 21, 2011 and is available for download from the
   <a href="http://sourceforge.net/projects/nuttx/files/">SourceForge</a> website.
   The change log associated with the release is available <a href="#currentrelease">here</a>.
   Unreleased changes after this release are available in SVN.
   These unreleased changes are listed <a href="#pendingchanges">here</a>.
 </p>
 <p>
-  This release includes several new features in various states of integration and maturity:
+  The version number of this release was bumped from 5.19 to 6.0.
+  A change in the major revision number is used to reflect an incompatibility with previous versions.
+  In this release, the NuttX core OS functionality has been separated from NuttX application-related functionality.
+  These are provided as separate tarballs:
 </p>
 <ul>
-
+  <li><code>nuttx-6.0.tar.gz</code>, and</li>
+  <li><code>apps-6.0.tar.gz</code></li>
+</ul>
+<p>
+  The purpose of this separation is both to better organize and modularize the NuttX source tree,
+  but also to provide better support for incorporation of end-user applications with Nuttx.
+</p>
+<p>
+  The incompatibily results from the changes to the board configuration logic needed to supported the separable application. 
+  The major changes to the configuration include:
+</p>
+<ul>
+  <li><code>CONFIG_APPS_DIR</code> - This should not, typically be set.
+    The default is <code>../apps</code>. 
+    This should only be set if you have a custom, product-specific application directory in some different location.
   </li>
-  <li>
-    <b>486SX QEMU port</b>.
-    This port supports the Intel 486SX architecture using the QEMU simulator.
-    Initial functionality is in place a partially tested.
-    There are still some outstanding issues with timer interrupts.
-    A large part of the i486 logic was contributed by Biff of
-    <a href="http://bifferos.bizhat.com">Bifferboard</a> fame.
-  </li>
-  <li>
-    <b>Platform specific application support</b>.
-    A new <code>apps/</code> directory appears in this port.
-    This <code>apps/</code> directory provides a mechanism for applications using NuttX to have a highly customizable initialization process.
-    It supports a set of end-user applications than can be executed
-    (1) standalone so you can have a fully customizable application startup, or
-    (2) on top of NSH.
-    Think of it this way:
-    In a buckled-up embedded application, your end-user programs will probably have their own dedicated start-up logic.
-    But, during development, you might want to have you applications available and executable from the NSH command line.
-    This <code>apps/</code> add-on (and NSH hooks) was contributed by Uros Platise to accomplish just that.
-  </li>
-  <li>
-    <b>Custom NSH <code>/etc/init.d/rcS</code> File</b>.
-    NSH was also extended to support application specific ROMFS <code>/etc/init.d/rcS</code> start-up scripts.
-    This feature, as well, as all of the above-mentioned <code>apps/</code> directory support was contributed by Uros Platise
-  </li>
-  <li>
-    Additional NSH improvements and bug fixes.  See the Changelog for details.
-  </li>
-  <li>
-    <b>SLIP</b>.
-    This release also provides a new SLIP network driver.
-    This driver should support point-to-point network communications to a host using TCP/IP or UDP.
-    This driver is code complete, but not tested in this release.
-  </li>
-  <li>
-    <b>RAMTROM FRAM Driver</b>.
-    New RAMTRON FRAM driver (contributed by Uros Platise)
-  </li>
-  <li>
-    <b>16550 UART Driver</b>.
-    New generic 16550 UART driver.
-  </li>
-  <li>
-    <b>Cortex-M3 Power improvements</b>.
-    The Cortex-M3 can now waits for Interrupt (WFI) in idle loop for reduced power consumption
-    (LPC17xx and STM32 only - contributed by Uros Platise))
-  </li>
-  <li>
-    <b><code>waitpid()</code></b>.
-    New <code>waitpid()</code> system interface.
-  </li>
-  <li>
-    <b>Bugfixes</b>.
-    Additional bugfixes: pipes, stdint.h, STM32 SDIO and SPI drivers
+  <li><code>appconfig</code> - Each board configuration now requires a new file called <code>appconfig</code>.
+    As its name suggests, this file provides new configuration information needed by the logic in <code>../apps</code>.
   </li>
 </ul>
+<p>
+  In addition to this major reorganization in the directory structure, this release also includes some important extensions to existing features and
+  some important bugfixes.
+  These include:
+</p>
+<ul>
+  <li>
+    The SLIP driver was been well debugged and significantly re-designed.
+    Now you can have an Ethernet connection to you board even if you have no Ethernet hardware.
+    How cool is that?
+  </li>
+  <li>
+    The QEMU i486 port is now functional.
+    It has also been reported to work on the <a href="http://bifferos.bizhat.com/">Bifferboard</a>.
+  </li>
+  <li>
+    And extensions to the uIP driver interface, and
+  </li>
+  <li>
+    Bug fixes to <code>fopen()</code> and STM32 GPIO configuration
+  </li>
+  <li>
+</ul>
+<p>
+  Please see the ChangeLog for details.
+</p>
 
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
@@ -1452,14 +1443,17 @@
   <td><br></td>
   <td>
     <p>
-      <b>QEMU i486</b>.
+      <b>QEMU/Bifferboard i486</b>.
       This port uses the <a href="http://wiki.qemu.org/Main_Page">QEMU</a> i486 and the native
       Linux, Cywgin, MinGW the GCC toolchain under Linux or Cygwin.
     </p>
     <ul>
       <p>
        <b>STATUS:</b>
-        This port is code complete but not yet tested.  Stayed tuned.
+         The basic port was code-complete in NuttX-5.19 and verifed in NuttX-6.0.
+         The port was verified using the OS and NuttShell (NSH) examples under QEMU.
+         The port is reported to be functional on the <a href="http://bifferos.bizhat.com">Bifferboard</a> as well.
+         This is a great, stable starting point for anyone interest in fleshing out the x86 port!
       </p>
     </ul>
   </td>
@@ -2074,113 +2068,7 @@ Other memory:
 </table>
 
 <ul><pre>
-nuttx-5.19 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
-
-    * arch/arm/stm32/stm32_idle.c -- During idle times, the STM32 now uses the
-      WFI instruction to sleep in a reduced power mode until the next interrupt
-      occurs (Contributed by Uros Platise).      
-    * NSH: 'mem' command renamed to 'free'.  Output is now more similar to the
-      Linux 'free' command.
-    * NSH: Correct a redirection bug in NSH.  The following would not work; it
-      resulted in a hang after the 'cat /dev/fifo':
-
-        nsh&gt; mkfile /dev/fifo
-        nsh&gt; cd /tmp             # /tmp is a mounted RAM disk
-        nsh&gt; cat /dev/fifo &gt; test.txt &amp;
-        nsh&gt; echo &quot;This is a test&quot; &gt; /dev/fifo
-
-      The error was caused because (1) there was a path that resulted in stdout
-      being closed (the &quot;hang&quot;) and also (2) the 'cat' command was always outputting
-      to stdout, not to the redirected file descriptor.  Now:
-
-        nsh&gt; cat test.txt
-        This is a test
-
-    * drivers/pipes/pipe_common.c --  Driver open method was not returning an EINTR
-      error when it received a signal.  Instead, it just re-started the wait.  This
-      makes it impossible to kill a background pipe operation from NSH.
-    * include/stdint.h -- Correct some errors in conditional compilation (submitted
-      by Johannes Hampel).
-    * arch/arm/lpc17xx/lp17_idle.c -- Uses the same logic as the STM32: uses the
-      WFI instruction to sleep in a reduced power mode until the next interrupt
-      occurs.
-    * configs/olimex-lpc1766stk -- Added an LED encoded to indicate if the LPC1766
-      is in sleeping.      
-    * examples/mm  -- This is a simplified version of the &quot;built-in&quot; memory manager
-      test of mm/mm_test.c.  It is simplified because it does not have access to
-      the internals of the memory manager as does mm/mm_test.c, but it has the
-      advantage that it runs in the actual NuttX tasking environment (the
-      mm/mm_test.c only runs in a PC simulation environment).
-    * drivers/mmcsd_sdio.c/h -- Several corrections submitted by Uros Platise.
-    * arch/x86 - Provide support for x86 architectures.  Support for the i486
-      architecture under QEMU is provided under arch/x86/include/i486,
-      arch/x86/include/qemu, arch/x86/src/i486, and arch/x86/src/qemu.
-    * configs/qemu-i486 - &quot;Board&quot; support configurations for verifying the QEME
-      i486 port.
-    * arch/arm/src/stm32/stm32_spi.c -- Correct base address of SPI3 (reported by
-      Uros Platise).
-    * drivers/mmcsd/mmcsd_sdio.c -- Correct a loop termination condition (also
-      reported by Uros Platise).
-    * drivers/mtd/ramtron.c -  Driver for SPI-based RAMTRON NVRAM devices FM25V10
-      (and others).  Contributed by Uros Platise.
-    * examples/nsh and tools/mkromfsimg.sh -- Add support for platform-specific
-      ROMFS-based NSH start-up scripts.
-    * drivers/uart_16550.c and include/nuttx/uart_16550.h - Support for a generic
-      16550 UART.
-    * configure/qemu-i486/nsh - QEMU NSH example.
-    * ../apps - The apps directory add-on was created by Uros Platise.  It
-      supports a set of end-user applications than can be executed on top of
-      NSH.  Think of it this way:  In a buckled-up embedded application, your
-      end-user programs will probably have their own dedicated start-up logic.
-      But, during development, you might want to have you applications
-      available and executable from the NSH command line.  This apps/ addon
-      (and NSH hooks) was contributed by Uros to accomplish just that.
-    * sched/sched_waitpid() and include/sys/wait.h - Provides a simple and
-      very incomplete implementation of waitpid().  waitpid() is only available
-      if CONFIG_SCHED_WAITPID is defined in your configuration file.
-    * sched/atexit.c and sched/exit.c - The atexit function is not frequently
-      used.  In order to save a few bytes, it is now conditioned on
-      CONFIG_SCHED_ATEXIT.  It your application is currently using atexit(),
-      you will need to add CONFIG_SCHED_ATEXT to your configuration file.
-    * drivers/net/slip.c - Add a SLIP driver (untested on initial check-in).
-    * configs/olimex-lpc1766stk/slip-httpd - An example that uses SLIP to
-      provide a serial-port based THTTPD web server.
-
-apps-5.19 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
-
-    * Initial version of the apps/ directory was released as contributed by
-      Uros Platise.
-
-pascal-2.0 2009-12-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
-
-    * Updated to use standard C99 types in stdint.h and
-      stdbool.h.  This change was necessary for compatibility
-      with NuttX-5.0 (any beyond).
-
-buildroot-1.9 2011-02-10 &lt;spudmonkey@racsa.co.cr&gt;
-
-    * configs/arm926t-defconfig-4.3.3: update arm926t-defconfig-4.2.4
-    * configs/arm926t-defconfig-nxflat: NXFLAT-only configuration for
-      arm926
-    * toolchain/gdb/gdb.mk - Remove ncurses dependency from gdb_target target.
-    * toolchain/gdb/gdb.mk - Added --disable-werror to GDB configuration line.
-      GDB 6.8 won't build because the tarbal was released with -Werror enabled and
-      the build stops on the first warning.
-    * Add support for Freescale m9s12x using binutils 2.18 and gcc 3.3.6 and
-      patches available from http://www.msextra.com/tools courtesy of James
-      Cortina.  Add configs/m9x12x-defconfig-3.3.6.
-</pre></ul>
-
-<table width ="100%">
-  <tr bgcolor="#e4e4e4">
-  <td>
-    <a name="pendingchanges">Unreleased Changes</a>
-  </td>
-  </tr>
-</table>
-
-<ul><pre>
-nuttx-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+nuttx-6.1 2011-03-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
     * lib/lib_fopen() -- fopen() was not returning the correct errno value
       when the underlying open() failed.
@@ -2229,7 +2117,7 @@ nuttx-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
     * apps/vsn - Move all VSN apps to apps/vsn.
     * nuttx/examples moved to apps/examples
 
-apps-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+apps-6.0 2011-03-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
     * README.txt -- README cosmetics
     * hello/ -- hello world minor changes
@@ -2238,6 +2126,39 @@ apps-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
     * hello/Makefile -- Now uses new Make.defs definitions.  Added README.txt.
     * apps/poweroff -- New application to turn off board power.
 
+pascal-2.0 2009-12-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+
+    * Updated to use standard C99 types in stdint.h and
+      stdbool.h.  This change was necessary for compatibility
+      with NuttX-5.0 (any beyond).
+
+buildroot-1.9 2011-02-10 &lt;spudmonkey@racsa.co.cr&gt;
+
+    * configs/arm926t-defconfig-4.3.3: update arm926t-defconfig-4.2.4
+    * configs/arm926t-defconfig-nxflat: NXFLAT-only configuration for
+      arm926
+    * toolchain/gdb/gdb.mk - Remove ncurses dependency from gdb_target target.
+    * toolchain/gdb/gdb.mk - Added --disable-werror to GDB configuration line.
+      GDB 6.8 won't build because the tarbal was released with -Werror enabled and
+      the build stops on the first warning.
+    * Add support for Freescale m9s12x using binutils 2.18 and gcc 3.3.6 and
+      patches available from http://www.msextra.com/tools courtesy of James
+      Cortina.  Add configs/m9x12x-defconfig-3.3.6.
+</pre></ul>
+
+<table width ="100%">
+  <tr bgcolor="#e4e4e4">
+  <td>
+    <a name="pendingchanges">Unreleased Changes</a>
+  </td>
+  </tr>
+</table>
+
+<ul><pre>
+nuttx-6.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+
+apps-6.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+
 pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
 buildroot-1.10 2011-xx-xx &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 85fc8010dca..3b00632fba9 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: March 20, 2011</p>
+      <p>Last Updated: March 21, 2011</p>
     </td>
   </tr>
 </table>
@@ -1016,7 +1016,6 @@ netutils/
 </p>
 <ul>
   <li>Copy <code>configs/</code><i>&lt;board-name&gt;</i><code>/[</code><i>&lt;config-dir&gt;</i><code>/appconfig</code> to &lt;app-dir&gt;<code>/.config</code></li>
-  <li><code>echo &quot;CONFIG_BUILTIN_APPS=y" &gt;&gt; "${TOPDIR}/.config&quot;</code></li>
   <li><code>echo &quot;APPS_LOC=\"&lt;app-dir&gt;\"" &gt;&gt; "${TOPDIR}/.config&quot;</code></li>
 </ul>
 
@@ -2668,10 +2667,10 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-      <code>CONFIG_APP_DIR</code>: Identifies the directory that builds the application to link with NuttX.
-      This symbol must be assigned to the path to the application build directory <i>relative</i> to the NuttX top build directory.
-      If the application resides in the top-level <code>apps</code> directory, it is not necessary to define <code>CONFIG_APP_DIR</code>.
-      If you had an application directory and the NuttX directory both within another directory like this:
+      <code>CONFIG_APPS_DIR</code>: Identifies the directory that builds the application to link with NuttX.
+      This symbol must be assigned to the path of the application build directory <i>relative</i> to the NuttX top build directory.
+      If the application resides in the top-level <code>../apps/</code> directory, it is not necessary to define <code>CONFIG_APPS_DIR</code>.
+      If you have an application directory and the NuttX directory each in separate directories such as this:
 <ul><pre>
 build
  |-nuttx
@@ -2681,14 +2680,15 @@ build
     |
     `- Makefile
 </pre></ul>
-      Then you would set <code>CONFIG_APP_DIR=../application</code>.
+      Then you would set <code>CONFIG_APPS_DIR=../application</code>.
+      The default value of <code>CONFIG_APPS_DIR</code> is <code>../apps/</code>.
     </p>
     <p>
       The application direction must contain <code>Makefile</code> and this make file must support the following targets:
       <ul>
         <li>
-          <code>libapp$(LIBEXT)</code> (usually <code>libapp.a</code>).
-          <code>libapp.a</code> is a static library ( an archive) that contains all of application object files.
+          <code>libapps$(LIBEXT)</code> (usually <code>libapps.a</code>).
+          <code>libapps.a</code> is a static library ( an archive) that contains all of application object files.
         </li>
         <li>
           <code>clean</code>.
@@ -2708,7 +2708,7 @@ build
     <p>
       When this application is invoked it will receive the setting <code>TOPDIR</code> like:
       <ul>
-        <code>$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR=&quot;$(TOPDIR)&quot;</code> &lt;target&gt;
+        <code>$(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR=&quot;$(TOPDIR)&quot;</code> &lt;target&gt;
       </ul>
     </p>
     <p>
diff --git a/Makefile b/Makefile
index b5c4dd6ae42..ed2f63e9b18 100644
--- a/Makefile
+++ b/Makefile
@@ -62,16 +62,22 @@ BOARD_DIR	= configs/$(CONFIG_ARCH_BOARD)
 # Add-on directories.  These may or may not be in place in the
 # NuttX source tree (they must be specifically installed)
 #
-# APPLOC can be over-ridden from the command line or in the .config file:
+# CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.
+# The default value of CONFIG_APPS_DIR is ../apps.  Ultimately, the application
+# will be built if APPDIR is defined.  APPDIR will be defined if a directory containing
+# a Makefile is found at the path provided by CONFIG_APPS_DIR
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
-ifeq ($(APPLOC),)
-APPLOC	= ../apps
-endif
-APPDIR		:= ${shell if [ -r $(APPLOC)/Makefile ]; then echo "$(APPLOC)"; fi}
+ifeq ($(CONFIG_APPS_DIR),)
+CONFIG_APPS_DIR	= ../apps
 endif
+APPDIR		:= ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi}
+
+# The Pascal p-code add-on directory
 
 PCODE_DIR	:= ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi}
+
+# All add-on directories
+
 ADDON_DIRS	:= $(PCODE_DIR) $(NX_DIR) $(APPDIR)
 
 # FSDIRS depend on file descriptor support; NONFSDIRS do not
@@ -88,10 +94,6 @@ NONFSDIRS	+= graphics
 CONTEXTDIRS	+= graphics
 endif
 
-ifneq ($(CONFIG_APP_DIR),)
-NONFSDIRS	= $(CONFIG_APP_DIR)
-endif
-
 # CLEANDIRS are the directories that will clean in.  These are
 #   all directories that we know about.
 # MAKEDIRS are the directories in which we will build targets
@@ -146,17 +148,11 @@ ifeq ($(CONFIG_HAVE_CXX),y)
 LINKLIBS	+= libxx/liblibxx$(LIBEXT)
 endif
 
-# Add application-specific library
-
-ifneq ($(CONFIG_APP_DIR),)
-LINKLIBS	= $(CONFIG_APP_DIR)/libapp$(LIBEXT)
-endif
-
 # Add library for application support
 # Always compile the framework which includes exec_nuttapp if users
 # or nuttX applications are to be included.
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifneq ($(APPDIR),)
 LINKLIBS	+= $(APPDIR)/libapps$(LIBEXT)
 endif
 
@@ -291,9 +287,6 @@ pcode/libpcode$(LIBEXT): context
 graphics/libgraphics$(LIBEXT): context
 	@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT)
 
-$(CONFIG_APP_DIR)/libapp$(LIBEXT): context
-	@$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" libapp$(LIBEXT)
-
 # If the 2 pass build option is selected, then this pass1 target is
 # configured be build a extra link object. This is assumed to be an
 # incremental (relative) link object, but could be a static library
@@ -355,6 +348,7 @@ depend: context
 	done
 
 subdir_clean:
+	echo "CLEANDIRS: $(CLEANDIRS)"
 	@for dir in $(CLEANDIRS) ; do \
 		if [ -e $$dir/Makefile ]; then \
 			$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean ; \
diff --git a/ReleaseNotes b/ReleaseNotes
index a00ac19b5ce..cd9ac527794 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1694,7 +1694,7 @@ identified in the ChangeLog.  Headlines would include:
     * Incorporated the LUFA HID parser.
     * Various bugfix as detailed in the ChangeLog
 
-nuttx-5.18
+nuttx-5.19
 ^^^^^^^^^^
 
 The 66th release of NuttX, Version 5.19, was made on March 12, 2011 and is
@@ -1730,3 +1730,50 @@ several new features in various states of integration and maturity:
       Uros Platise))
     * New waitpid() system interface.
     * Additional bugfixes: pipes, stdint.h, STM32 SDIO and SPI drivers
+
+nuttx-6.0
+^^^^^^^^^
+
+The 67th release of NuttX, Version 6.0, was made on March 21, 2011 and is
+available for download from the SourceForge website.  The version number of
+this release was bumped from 5.19 to 6.0.  A change in the major revision
+number is used to reflect an incompatibility with previous versions.  In
+this release, the NuttX core OS functionality has been separated from NuttX
+application-related functionality.  These are provided as separate tarballs:
+
+    * nuttx-6.0.tar.gz, and
+    * apps-6.0.tar.gz
+
+The purpose of this separation is both to better organize and modularize the
+NuttX source tree, but also to provide better support for incorporation of
+end-user applications with Nuttx.
+
+The incompatibily results from the changes to the board configuration logic
+needed to supported the separable application.  The major changes to the
+configuration include:
+
+    * CONFIG_APPS_DIR - This should not be set.  The default is ../apps.  This
+      should only be set if you have a custom, product-specific application
+      directory in some different location.
+
+    * appconfig - Each board configuration now requires a new file called 
+      'appconfig.'  As its name suggests, this file provides new configuration
+      information needed by the logic in ../apps.
+
+In addition to this major reorganization in the directory structure, this
+release also includes some important extensions to existing features and some
+important bugfixes.  These include:
+
+    * The SLIP driver was been well debugged and significantly re-designed.
+      Now you can have an Ethernet connection to you board even if you have
+      no Ethernet hardware.  How cool is that?
+
+    * The QEMU i486 port is now functional.  It has also been reported to
+      work on the Bifferboard (see http://bifferos.bizhat.com/).
+
+    * And extensions to the uIP driver interface, and
+
+    * Bug fixes to fopen() and STM32 GPIO configuration
+
+Please see the ChangeLog for details.
+
diff --git a/TODO b/TODO
index ef73e2e800a..99be2df886f 100644
--- a/TODO
+++ b/TODO
@@ -687,7 +687,7 @@ o ARM/LPC17xx (arch/arm/src/lpc17xx/)
                debug disabled.  For some reason, certain debug statements hang(?).
                Also, this example does not use UART1's hardware flow control.  UART1
                hardware flow control is partially implemented but does not behave as
-               expected.  It needs a little more work.
+               expected.  Hardware flow control needs a little more work.
   Status:      Open
   Priority:    Low
 
diff --git a/configs/README.txt b/configs/README.txt
index f7891dd08ab..152a456458d 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -168,8 +168,8 @@ defconfig -- This is a configuration file similar to the Linux
 
 	Building application code:
 
-		CONFIG_APP_DIR - Identifies the directory that builds the
-		  application to link with NuttX. This symbol must be assigned
+		CONFIG_APPS_DIR - Identifies the directory that builds the
+		  application to link with NuttX.  Default: ../apps This symbol must be assigned
 		  to the path to the application build directory *relative* to
 		  the NuttX top build direcory. If you had an application
           directory and the NuttX directory each in separate directory
@@ -183,12 +183,12 @@ defconfig -- This is a configuration file similar to the Linux
 		   |
 		   `- Makefile
 
-		  Then you would set CONFIG_APP_DIR=../application.
+		  Then you would set CONFIG_APPS_DIR=../application.
 
 		  The application direction must contain Makefile and this make
 		  file must support the following targets:
 
-		  - libapp$(LIBEXT) (usually libapp.a). libapp.a is a static
+		  - libapps$(LIBEXT) (usually libapps.a). libapps.a is a static
 		    library ( an archive) that contains all of application object
 		    files.
 		  - clean. Do whatever is appropriate to clean the application
@@ -201,7 +201,7 @@ defconfig -- This is a configuration file similar to the Linux
 
 		  When this application is invoked it will receive the setting TOPDIR like:
 
-		    $(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" <target>
+		    $(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR="$(TOPDIR)" <target>
 
 		  TOPDIR is the full path to the NuttX directory. It can be used, for
 		  example, to include makefile fragments (e.g., .config or Make.defs)
@@ -1108,7 +1108,6 @@ And if configs/<board-name>/<config-dir>/appconfig exists in the board
 configuration directory:
 
   Copy configs/<board-name>/<config-dir>/appconfig to <app-dir>/.config
-  echo "CONFIG_BUILTIN_APPS=y" >> "${TOPDIR}/.config"
   echo "APPS_LOC=\"<app-dir>\"" >> "${TOPDIR}/.config"
 
 tools/configure.sh
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 4be6e47eec3..bbe3a92f98a 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -216,8 +216,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -305,7 +305,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index ae27af68b25..c6898435303 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -216,8 +216,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -305,7 +305,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 4e94cef9794..e7e3479f847 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index f262d500107..fb35d1ee852 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -135,8 +135,8 @@ CONFIG_NET_C5471_BASET10=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -200,7 +200,7 @@ CONFIG_NET_C5471_BASET10=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 065f29d68bc..026d761ba9a 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/c5471evm/ostest/defconfig b/configs/c5471evm/ostest/defconfig
index a0e2d355e68..2cbc0fe5134 100644
--- a/configs/c5471evm/ostest/defconfig
+++ b/configs/c5471evm/ostest/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 2f5f7cf53f9..80cec002f1e 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -194,8 +194,8 @@ CONFIG_PASS1_OBJECT=init.r
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -283,7 +283,7 @@ CONFIG_PASS1_OBJECT=init.r
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/detron/hidkbd/defconfig b/configs/detron/hidkbd/defconfig
index d116d1fab7b..28efc6d7427 100755
--- a/configs/detron/hidkbd/defconfig
+++ b/configs/detron/hidkbd/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -323,7 +323,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/detron/nsh/defconfig b/configs/detron/nsh/defconfig
index 4ae3f4bd605..c8af3917b6b 100755
--- a/configs/detron/nsh/defconfig
+++ b/configs/detron/nsh/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/detron/ostest/defconfig b/configs/detron/ostest/defconfig
index b418e996f9b..f247c9a2a25 100755
--- a/configs/detron/ostest/defconfig
+++ b/configs/detron/ostest/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/detron/wlan/defconfig b/configs/detron/wlan/defconfig
index ddfcd444345..5a4e63220fa 100755
--- a/configs/detron/wlan/defconfig
+++ b/configs/detron/wlan/defconfig
@@ -235,8 +235,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ea3131/locked/Makefile b/configs/ea3131/locked/Makefile
index a6bae11a06f..0537815780e 100755
--- a/configs/ea3131/locked/Makefile
+++ b/configs/ea3131/locked/Makefile
@@ -44,18 +44,18 @@ PASS1_LIBBOARD	= $(PASS1_BOARDDIR)/libboard$(LIBEXT)
 
 # Where is the application library?
 
-ifneq ($(CONFIG_APP_DIR),)
-PASS1_LIBAPP	= $(CONFIG_APP_DIR)/libapp$(LIBEXT)
+ifneq ($(CONFIG_APPS_DIR),)
+PASS1_LIBAPPS	= $(CONFIG_APPS_DIR)/libapps$(LIBEXT)
 else
 ifneq ($(APPDIR),)
-PASS1_LIBAPP	= $(APPDIR)/libapps$(LIBEXT)
+PASS1_LIBAPPS	= $(APPDIR)/libapps$(LIBEXT)
 endif
 endif
 
-# Remove the application library (libapp) from the list of libraries.  Add
+# Remove the application library (libapps) from the list of libraries.  Add
 # the boad library (liboard)
 
-PASS1_LINKLIBS	= $(filter-out $(PASS1_LIBAPP),$(LINKLIBS))
+PASS1_LINKLIBS	= $(filter-out $(PASS1_LIBAPPS),$(LINKLIBS))
 PASS1_LINKLIBS	+= $(PASS1_LIBBOARD)
 
 # Get the paths to the libraries and the links script path in format that
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index e79f4cee137..712c85fd8c5 100755
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 7c47da43f46..c09f0c00be1 100755
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 33b3782241d..859b606be58 100755
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -208,8 +208,8 @@ CONFIG_PASS1_OBJECT=locked.r
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -297,7 +297,7 @@ CONFIG_PASS1_OBJECT=locked.r
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 060e096e127..4b2530af63a 100755
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_FS=n
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 34e7609f9e0..da1f5afc782 100755
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_FS=n
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 129285cab5e..4d819930b0e 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 05705add5bd..f7810a201bf 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 14b28a5dcc4..b20d339d727 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 7cf4e28355a..dd5c46a4bf0 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -265,7 +265,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 6d9a2a3b5c5..321a0911a48 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -274,7 +274,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index c5ac3882709..0008b8e75d8 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -271,7 +271,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 031dae4cd1a..fe23817c133 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -167,8 +167,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -234,7 +234,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 475d12e253d..9270d05228b 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_NET - enables debug of the network subsystem
@@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index ff68c80c3d8..026ccdd0850 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_NET - enables debug of the network subsystem
@@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 22713e28095..746bd022470 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_NET - enables debug of the network subsystem
@@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index fda8b9fb03d..c866e95428d 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_NET - enables debug of the network subsystem
@@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index fd2c7df58c2..2bb4ce44e4a 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -170,8 +170,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -237,7 +237,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 8546f566386..b5cde349f31 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 71d9367eaba..77357971f57 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index a0afe732c36..a0f15555933 100755
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -222,8 +222,8 @@ CONFIG_SPI_CMDDATA=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -293,7 +293,7 @@ CONFIG_SPI_CMDDATA=y
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index a51d3aa4ac3..933db9a5a9a 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index eade135b6ea..add9a61678e 100755
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 326a28b4906..1be795ecd63 100755
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -222,8 +222,8 @@ CONFIG_SPI_CMDDATA=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -293,7 +293,7 @@ CONFIG_SPI_CMDDATA=y
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index 659b6a4426c..db9304a4ccc 100755
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 06c188c8562..ddd7fcbf6ad 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -105,8 +105,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -167,7 +167,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 46ae66bdbed..dbda7b3e3fe 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 3f10cb1b164..905a11a7fec 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 605eea0da72..66f9def27cb 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 16565864350..1e47a77a228 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 093ead44edb..5ae98dba853 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index aee5c503cd9..f4e42378089 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 47688a22e59..81f271ec004 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -220,7 +220,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index 57670752cf1..47ce5e58b17 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -205,8 +205,8 @@ CONFIG_PASS1_OBJECT=init.r
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -294,7 +294,7 @@ CONFIG_PASS1_OBJECT=init.r
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index c72ba50d1cc..216eff7e741 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index bf2a4d8c317..d46a1b6c5d7 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -142,8 +142,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -207,7 +207,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 183000974d2..f9b863c280e 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 1e8faf42623..bb584936a87 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index a4003ef28b8..d92b971d1ab 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -147,8 +147,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -215,7 +215,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 3bb8fac40a0..a9dc75dcf46 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 61f8641a412..5b8b8d8788d 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index abfd3def391..7c8bc2c1733 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -233,8 +233,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -322,7 +322,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index 2539e617ee2..0b8df61243c 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 502ee3a8525..f20eed8f363 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index 871634660af..4eeac6d4fbd 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 78f50af0321..a55ba91a9a8 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 20153e31041..353036bfd4c 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index b16abf38f7e..db03deeeae2 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index d45d7a29689..2d61bca84b1 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -236,8 +236,8 @@ CONFIG_SPI_CMDDATA=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -325,7 +325,7 @@ CONFIG_SPI_CMDDATA=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index f5b46927cd7..4122d8d09b2 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index b7c6f17312c..049b751c885 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -322,7 +322,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index a7f8a9f250d..b92d886d544 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 436ca1ea69a..73f52406db6 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index 4b56fb1fe25..841601f7445 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig
index 61cd0085e1e..e80c70622f8 100755
--- a/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/configs/olimex-lpc1766stk/wlan/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -325,7 +325,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index c2ffdb8379d..597b80d5dbd 100755
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -162,8 +162,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_MM_REGIONS - If the architecture includes multiple
@@ -193,7 +193,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console
 #   driver (minimal support)
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 #CONFIG_DEBUG_MM=y
diff --git a/configs/olimex-lpc2378/ostest/defconfig b/configs/olimex-lpc2378/ostest/defconfig
index c1bec6554ea..a7b0b25d5e8 100755
--- a/configs/olimex-lpc2378/ostest/defconfig
+++ b/configs/olimex-lpc2378/ostest/defconfig
@@ -162,8 +162,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_MM_REGIONS - If the architecture includes multiple
@@ -193,7 +193,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console
 #   driver (minimal support)
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 #CONFIG_DEBUG_MM=y
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index a91e9af0c7f..9179ae8d3cd 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -289,7 +289,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index d253aef86d5..a8ba5270955 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -271,7 +271,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index a625349fc69..dc81b213fbb 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -271,7 +271,7 @@ CONFIG_HAVE_LIBM=n
 #  This format will support execution of NuttX binaries located
 #  in a ROMFS filesystem (see examples/nxflat).
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index b2303d0c70b..2ae280ff16d 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -103,8 +103,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -165,7 +165,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 60f60b6979d..3a70e23f3ce 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -174,8 +174,8 @@ CONFIG_UART3_2STOP=0
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory that builds
-#   the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory that builds
+#   the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with debug symbols
@@ -230,7 +230,7 @@ CONFIG_UART3_2STOP=0
 #   task_create() when a new task is started. If set, all sockets will appear
 #   to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 9e3f0891cb4..140dc903269 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -90,8 +90,8 @@ CONFIG_ARCH_DMA=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory that builds
-#   the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory that builds
+#   the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with debug symbols
@@ -146,7 +146,7 @@ CONFIG_ARCH_DMA=n
 #   task_create() when a new task is started. If set, all sockets will appear
 #   to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 65a56ff7429..5e44d5fe541 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -292,7 +292,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index fce97cd3759..6c11f93aefa 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -292,7 +292,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index 9001608747f..f5991cdc5ac 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -293,7 +293,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 6682c8a7f08..f829db30c37 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index d4354238fe9..378a0cf3e2e 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 4cdb88df91c..5bc0c34c764 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 23edd54ddb6..f2d13ac0eda 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=8
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -121,7 +121,7 @@ CONFIG_SIM_FBBPP=8
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11
index d01f545228d..f53d6c1b5c3 100644
--- a/configs/sim/nx/defconfig-x11
+++ b/configs/sim/nx/defconfig-x11
@@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=32
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -121,7 +121,7 @@ CONFIG_SIM_FBBPP=32
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 41da39ce792..7c998e84728 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 2a31128feb7..f697e247da3 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index d743397cd33..1b611c63c2b 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -150,8 +150,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -212,7 +212,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index 83ebe4fe2e7..78da2fa7ead 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -226,8 +226,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -315,7 +315,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 7a54c879b30..384a96a1a74 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -325,7 +325,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 075e3f213d2..9a4a8bb0a10 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index c469da139b5..e4b640ea01a 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_USB=n
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index ef37ef8d7f2..48b4480e41f 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -325,7 +325,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_FS=n
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index e9ee5805de9..768a83d5fb9 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -216,7 +216,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index c87235acc4f..06326b2ab98 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -216,7 +216,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 52bea358bae..a6fffc4c6e3 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -339,7 +339,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 18286cefcfc..9fdcc523726 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index f11088c30e0..e067876367d 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 932fc2932fb..b5e4a68b03f 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 28dac2c9fea..a1d304ed79c 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -189,7 +189,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 5b9c820b21c..6103d823691 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -189,7 +189,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 40b6ea423e7..ad71864ef50 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 660acbfc8f5..32db9860710 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 8e94f33c791..6c5d3724ac4 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 6c06006e6f9..6d89cca8436 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -184,7 +184,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 9a02ed8bfef..d814d7fcc48 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n
 #
 # General OS setup
 #
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-#   that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+#   that builds the application to link with NuttX.  Default: ../apps
 # CONFIG_DEBUG - enables built-in debug options
 # CONFIG_DEBUG_VERBOSE - enables verbose debug output
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -184,7 +184,7 @@ CONFIG_HAVE_LIBM=n
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
 #
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
diff --git a/sched/os_bringup.c b/sched/os_bringup.c
index 64b4e938862..dd413277ae0 100644
--- a/sched/os_bringup.c
+++ b/sched/os_bringup.c
@@ -54,7 +54,7 @@
 #ifdef CONFIG_SCHED_WORKQUEUE
 # include "work_internal.h"
 #endif
-#ifdef CONFIG_BUILTIN_APPS
+#ifdef CONFIG_BUILTIN_APP_START
 # include "apps/apps.h"
 #endif
 
@@ -120,7 +120,7 @@
 
 int os_bringup(void)
 {
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+#ifdef CONFIG_BUILTIN_APP_START 
   static const char *argv[3] = {NULL, "init", NULL};
 #endif
   int init_taskid;
@@ -155,8 +155,8 @@ int os_bringup(void)
    */
 
   svdbg("Starting init thread\n");
-  
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+
+#ifdef CONFIG_BUILTIN_APP_START
   /* Start the built-in application, passing an "init" argument, so that
    * application can distinguish different run-levels 
    */
diff --git a/tools/configure.sh b/tools/configure.sh
index 8e56c2a0ea0..a4e74d4ee9a 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -162,8 +162,7 @@ if [ ! -z "${appdir}" ]; then
     echo "" >> "${TOPDIR}/.config"
     echo "# Application configuration" >> "${TOPDIR}/.config"
     echo "" >> "${TOPDIR}/.config"
-    echo "CONFIG_BUILTIN_APPS=y" >> "${TOPDIR}/.config"
-    echo "APPLOC=\"$appdir\"" >> "${TOPDIR}/.config"
+    echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.config"
   fi
 fi
 
diff --git a/tools/zipme.sh b/tools/zipme.sh
index bf8041a4f71..448a53a5783 100755
--- a/tools/zipme.sh
+++ b/tools/zipme.sh
@@ -67,40 +67,44 @@ else
    fi
 fi
 
-# Get the NuttX directory name and the path to the parent directory
+# Get the NuttX directory names and the path to the parent directory
 
-NUTTXDIR=${PROJECTS}/nuttx-${VERSION}
-NUTTX=${NUTTXDIR}/nuttx
-APPS=${NUTTXDIR}/apps
+TRUNKDIR=${PROJECTS}/trunk
+NUTTX=${TRUNKDIR}/nuttx-${VERSION}
+APPDIR=${TRUNKDIR}/apps-${VERSION}
 
 # Make sure that the versioned directory exists
 
-if [ ! -d ${NUTTXDIR} ]; then
-   echo "Directory ${NUTTXDIR} does not exist"
+if [ ! -d ${TRUNKDIR} ]; then
+   echo "Directory ${TRUNKDIR} does not exist"
    exit 1
 fi
 
-cd ${PROJECTS} || \
-   { echo "Failed to cd to ${PROJECTS}" ; exit 1 ; }
+cd ${TRUNKDIR} || \
+   { echo "Failed to cd to ${TRUNKDIR}" ; exit 1 ; }
 
 if [ ! -d nuttx-${VERSION} ] ; then
    echo "Directory ${PROJECTS}/nuttx-${VERSION} does not exist!"
    exit 1
 fi
 
-if [ ! -d ${APPS} ] ; then
-   echo "Directory ${APPS} does not exist!"
+if [ ! -d app-${VERSION} ] ; then
+   echo "Directory ${PROJECTS}/nuttx-${VERSION} does not exist!"
    exit 1
 fi
 
-TAR_NAME=nuttx-${VERSION}.tar
-ZIP_NAME=${TAR_NAME}.gz
+# Create the versioned tarball names
+
+NUTTX_TARNAME=nuttx-${VERSION}.tar
+APPS_TARNAME=apps-${VERSION}.tar
+NUTTX_ZIPNAME=${NUTTX_TARNAME}.gz
+APPS_ZIPNAME=${APPS_TARNAME}.gz
 
 # Prepare the nuttx directory -- Remove editor garbage
 
-find ${NUTTXDIR} -name '*~' -exec rm -f '{}' ';' || \
+find ${TRUNKDIR} -name '*~' -exec rm -f '{}' ';' || \
       { echo "Removal of emacs garbage failed!" ; exit 1 ; }
-find ${NUTTXDIR} -name '*.swp' -exec rm -f '{}' ';' || \
+find ${TRUNKDIR} -name '*.swp' -exec rm -f '{}' ';' || \
       { echo "Removal of VI garbage failed!" ; exit 1 ; }
 
 # Make sure that all of the necessary soft links are in place
@@ -111,6 +115,14 @@ cd ${NUTTX}/Documentation || \
 ln -sf ../TODO TODO.txt
 ln -sf ../ChangeLog ChangeLog.txt
 
+# Write a version file into the NuttX directoy.  The syntax of file is such that it
+# may be sourced by a bash script or included by a Makefile.
+
+echo "#!/bin/bash" >${NUTTX}/.version
+echo "" >>${NUTTX}/.version
+echo "CONFIG_NUTTX_VERSION=\"${VERSION}\"" >>${NUTTX}/.version
+chmod 755 ${NUTTX}/.version
+
 # Perform a full clean for the distribution
 
 cd ${PROJECTS} || \
@@ -120,31 +132,44 @@ make -C ${NUTTX} distclean
 
 # Remove any previous tarballs
 
-if [ -f ${TAR_NAME} ] ; then
-   echo "Removing ${PROJECTS}/${TAR_NAME}"
-   rm -f ${TAR_NAME} || \
-      { echo "rm ${TAR_NAME} failed!" ; exit 1 ; }
+if [ -f ${NUTTX_TARNAME} ] ; then
+   echo "Removing ${PROJECTS}/${NUTTX_TARNAME}"
+   rm -f ${NUTTX_TARNAME} || \
+      { echo "rm ${NUTTX_TARNAME} failed!" ; exit 1 ; }
 fi
 
-if [ -f ${ZIP_NAME} ] ; then
-   echo "Removing ${PROJECTS}/${ZIP_NAME}"
-   rm -f ${ZIP_NAME} || \
-      { echo "rm ${ZIP_NAME} failed!" ; exit 1 ; }
+if [ -f ${NUTTX_ZIPNAME} ] ; then
+   echo "Removing ${PROJECTS}/${NUTTX_ZIPNAME}"
+   rm -f ${NUTTX_ZIPNAME} || \
+      { echo "rm ${NUTTX_ZIPNAME} failed!" ; exit 1 ; }
 fi
 
-# Write a version file.  The syntax of file is such that it may be sourced
-# by a bash script or included by a Makefile
+if [ -f ${APPS_TARNAME} ] ; then
+   echo "Removing ${PROJECTS}/${APPS_TARNAME}"
+   rm -f ${APPS_TARNAME} || \
+      { echo "rm ${APPS_TARNAME} failed!" ; exit 1 ; }
+fi
 
-echo "#!/bin/bash" >${NUTTX}/.version
-echo "" >>${NUTTX}/.version
-echo "CONFIG_NUTTX_VERSION=\"${VERSION}\" >>${NUTTX}/.version
-chmod 755 ${NUTTX}/.version
+if [ -f ${APPS_ZIPNAME} ] ; then
+   echo "Removing ${PROJECTS}/${APPS_ZIPNAME}"
+   rm -f ${APPS_ZIPNAME} || \
+      { echo "rm ${APPS_ZIPNAME} failed!" ; exit 1 ; }
+fi
 
-# Then zip-up the directories
+# Then tar and zip-up the directories
 
-${TAR} ${TAR_NAME} nuttx-${VERSION}/nuttx nuttx-${VERSION}/apps || \
-      { echo "tar of ${TAR_NAME} failed!" ; exit 1 ; }
-${ZIP} ${TAR_NAME} || \
-      { echo "zip of ${TAR_NAME} failed!" ; exit 1 ; }
+cd ${TRUNKDIR} || \
+   { echo "Failed to cd to ${TRUNKDIR}" ; exit 1 ; }
+
+${TAR} ${NUTTX_TARNAME} nuttx-${VERSION}/nuttx || \
+      { echo "tar of ${NUTTX_TARNAME} failed!" ; exit 1 ; }
+${ZIP} ${NUTTX_TARNAME} || \
+      { echo "zip of ${NUTTX_TARNAME} failed!" ; exit 1 ; }
+
+${TAR} ${APPS_TARNAME} nuttx-${VERSION}/nuttx || \
+      { echo "tar of ${APPS_TARNAME} failed!" ; exit 1 ; }
+${ZIP} ${APPS_TARNAME} || \
+      { echo "zip of ${APPS_TARNAME} failed!" ; exit 1 ; }
 
 cd ${NUTTX}
+