diff --git a/tools/configure.sh b/tools/configure.sh
index a90517d9de9..6455fc49fce 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -282,6 +282,4 @@ fi
 # The saved defconfig files are all in compressed format and must be
 # reconstitued before they can be used.
 
-cd ${TOPDIR} || { echo "Failed to cd to ${TOPDIR}"; exit 10; }
-
-./tools/sethost.sh $debug $host
+${TOPDIR}/tools/sethost.sh $debug $host
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 5a75885accb..8ebac02c076 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -125,6 +125,9 @@ if [ ! -z "$1" ]; then
   showusage
 fi
 
+WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
+cd $WD
+
 if [ -x sethost.sh ]; then
   nuttx=$PWD/..
 else