diff --git a/Makefile b/Makefile
index 1e180b14245..8e875cf64e3 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ BOARD_DIR	= configs/$(CONFIG_ARCH_BOARD)
 # APPS_LOC can be over-ridden from the command line:
 
 ifeq ($(CONFIG_BUILTIN_APPS),y)
-ifeq ($(APP_LOC),)
+ifeq ($(APPS_LOC),)
 APPS_LOC	= ../apps
 endif
 APPS_DIR	:= ${shell if [ -r $(APPS_LOC)/Makefile ]; then echo "$(APPS_LOC)"; fi}
diff --git a/configs/avr32dev1/nsh/appconfig b/configs/avr32dev1/nsh/appconfig
index a34eda375bf..d1701eff279 100644
--- a/configs/avr32dev1/nsh/appconfig
+++ b/configs/avr32dev1/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/detron/nsh/appconfig b/configs/detron/nsh/appconfig
index 57fd7491562..7abe0c6ed5c 100644
--- a/configs/detron/nsh/appconfig
+++ b/configs/detron/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/ea3131/nsh/appconfig b/configs/ea3131/nsh/appconfig
index 878ce18531b..85f04b727b4 100644
--- a/configs/ea3131/nsh/appconfig
+++ b/configs/ea3131/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/eagle100/nsh/appconfig b/configs/eagle100/nsh/appconfig
index 97028d4c3dc..91ae18de21c 100644
--- a/configs/eagle100/nsh/appconfig
+++ b/configs/eagle100/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/ez80f910200zco/nsh/appconfig b/configs/ez80f910200zco/nsh/appconfig
index db733c0ba56..80161aac8b0 100644
--- a/configs/ez80f910200zco/nsh/appconfig
+++ b/configs/ez80f910200zco/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/lm3s6965-ek/nsh/appconfig b/configs/lm3s6965-ek/nsh/appconfig
index d4f8c3ad62d..8c0158df011 100644
--- a/configs/lm3s6965-ek/nsh/appconfig
+++ b/configs/lm3s6965-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/lm3s8962-ek/nsh/appconfig b/configs/lm3s8962-ek/nsh/appconfig
index 4c5c6d15776..723d429ac39 100644
--- a/configs/lm3s8962-ek/nsh/appconfig
+++ b/configs/lm3s8962-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/mbed/nsh/appconfig b/configs/mbed/nsh/appconfig
index 3563dcc6349..f06086b59ec 100644
--- a/configs/mbed/nsh/appconfig
+++ b/configs/mbed/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/mcu123-lpc214x/nsh/appconfig b/configs/mcu123-lpc214x/nsh/appconfig
index 439fa9c7f58..a0d5aadb254 100644
--- a/configs/mcu123-lpc214x/nsh/appconfig
+++ b/configs/mcu123-lpc214x/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/ntosd-dm320/nsh/appconfig b/configs/ntosd-dm320/nsh/appconfig
index f43f1205817..4378bc7b199 100644
--- a/configs/ntosd-dm320/nsh/appconfig
+++ b/configs/ntosd-dm320/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/nucleus2g/nsh/appconfig b/configs/nucleus2g/nsh/appconfig
index 7c6dd08f82b..2a369b8abbb 100644
--- a/configs/nucleus2g/nsh/appconfig
+++ b/configs/nucleus2g/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/olimex-lpc1766stk/nsh/appconfig b/configs/olimex-lpc1766stk/nsh/appconfig
index 58b0c3b53cb..64bdcee3f68 100644
--- a/configs/olimex-lpc1766stk/nsh/appconfig
+++ b/configs/olimex-lpc1766stk/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/olimex-lpc2378/nsh/appconfig b/configs/olimex-lpc2378/nsh/appconfig
index 21d8d346ed0..13b19fd1ab7 100644
--- a/configs/olimex-lpc2378/nsh/appconfig
+++ b/configs/olimex-lpc2378/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/olimex-strp711/nsh/appconfig b/configs/olimex-strp711/nsh/appconfig
index b8fc1d2384f..b988f2098ca 100644
--- a/configs/olimex-strp711/nsh/appconfig
+++ b/configs/olimex-strp711/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/qemu-i486/nsh/appconfig b/configs/qemu-i486/nsh/appconfig
index 6ad247659b1..1e0507ce89a 100644
--- a/configs/qemu-i486/nsh/appconfig
+++ b/configs/qemu-i486/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/sam3u-ek/nsh/appconfig b/configs/sam3u-ek/nsh/appconfig
index 2ce87137219..68384b897da 100644
--- a/configs/sam3u-ek/nsh/appconfig
+++ b/configs/sam3u-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/sim/nsh/appconfig b/configs/sim/nsh/appconfig
index 6e5816518ab..01e99d2195b 100644
--- a/configs/sim/nsh/appconfig
+++ b/configs/sim/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/stm3210e-eval/nsh/appconfig b/configs/stm3210e-eval/nsh/appconfig
index 2b6c4330223..d26c51dc7b5 100644
--- a/configs/stm3210e-eval/nsh/appconfig
+++ b/configs/stm3210e-eval/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/us7032evb1/nsh/appconfig b/configs/us7032evb1/nsh/appconfig
index b3d0be81ab8..ca3b0438526 100644
--- a/configs/us7032evb1/nsh/appconfig
+++ b/configs/us7032evb1/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/vsn/nsh/appconfig b/configs/vsn/nsh/appconfig
index 65e8c220fa2..0d7fd27f402 100755
--- a/configs/vsn/nsh/appconfig
+++ b/configs/vsn/nsh/appconfig
@@ -49,24 +49,24 @@
 #CONFIG_BUILTIN_APP_START="hello"
 
 # Application Libraries
-CONFIGURED_APPS += nshlib/.built_always
+CONFIGURED_APPS += nshlib=.built_always
 
 # Individual selection of built-in applications:
 
 # Hello world provide a simple skeleton/demo application
-CONFIGURED_APPS += hello/.built_always
+CONFIGURED_APPS += hello=.built_always
 
 # Provide poweroff command to switch off the board
-CONFIGURED_APPS += poweroff/.built_always 
+CONFIGURED_APPS += poweroff=.built_always 
 
 # Provide SDcard tool
-CONFIGURED_APPS += sdcard/.built_always 
+CONFIGURED_APPS += sdcard=.built_always 
 
 # Provide RAMTRON tool
-CONFIGURED_APPS += ramtron/.built_always 
+CONFIGURED_APPS += ramtron=.built_always 
 
 # Provide UNIX style free 
-CONFIGURED_APPS += free/.built_always 
+CONFIGURED_APPS += free=.built_always 
 
 # Provide JAVA Virtual Machine (the Darjeeling JVM)
-#CONFIGURED_APPS += jvm/.built_always 
+#CONFIGURED_APPS += jvm=.built_always 
diff --git a/configs/xtrs/nsh/appconfig b/configs/xtrs/nsh/appconfig
index 7325820e926..223d5542312 100644
--- a/configs/xtrs/nsh/appconfig
+++ b/configs/xtrs/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/configs/z80sim/nsh/appconfig b/configs/z80sim/nsh/appconfig
index acd2aa82df4..229d3a54856 100644
--- a/configs/z80sim/nsh/appconfig
+++ b/configs/z80sim/nsh/appconfig
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/tools/configure.sh b/tools/configure.sh
index a68561d82ec..e20b1cf6b08 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configure.sh
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,16 @@
 
 WD=`pwd`
 TOPDIR="${WD}/.."
-USAGE="${0} [-d] [-a <app-dir>] <board-name>"
+USAGE="
+
+USAGE: ${0} [-d] [-a <app-dir>] <board-name>/<config-name>
+
+Where:
+  <board-name> is the name of the board in the configs directory
+  <config-name> is the name of the board configuration sub-directory
+  <add-dir> is the path to the apps/ directory, relative to the nuttx directory
+
+"
 
 # Parse command arguments
 
@@ -47,7 +56,7 @@ while [ ! -z "$1" ]; do
       set -x
       ;;
     -h )
-      echo "$usage"
+      echo "$USAGE"
       exit 0
       ;;
     -a )
@@ -110,7 +119,7 @@ fi
 
 if [ -z "${appdir}" ]; then
   if [ -d "${TOPDIR}/../apps" ]; then
-    appdir="${TOPDIR}/../apps"
+    appdir="../apps"
   fi
 fi
 
@@ -130,7 +139,7 @@ if [ ! -z "${appdir}" ]; then
   if [ ! -r "${configpath}/appconfig" ]; then
     echo "NOTE: No readable appconfig file found in ${configpath}"
   else
-    cp -f "${configpath}/appconfig" "${appdir}/.config" || \
+    cp -f "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \
       { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
 
     echo "" >> "${TOPDIR}/.config"