diff --git a/build.bat b/build.bat
index ec901a1f1..3faf80fc3 100755
--- a/build.bat
+++ b/build.bat
@@ -4,7 +4,7 @@ REM   Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
 REM   reserved.
 
 set REAL_ANT_HOME=%ANT_HOME%
-set ANT_HOME=bootstrap
+set ANT_HOME=%~dp0\bootstrap
 if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap\bin\lcp.bat if exist bootstrap\bin\antRun.bat goto runAnt
 call bootstrap.bat
 if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap\bin\lcp.bat if exist bootstrap\bin\antRun.bat goto runAnt
diff --git a/build.sh b/build.sh
index 328123542..dfbaaa8f6 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,11 @@ case "`uname`" in
 esac
 
 REALANTHOME=$ANT_HOME
-ANT_HOME=bootstrap
+if [ -z $PWD ]; then
+    ANT_HOME=./bootstrap
+else
+    ANT_HOME=$PWD/bootstrap
+fi
 export ANT_HOME
 
 if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then