diff --git a/bootstrap.bat b/bootstrap.bat
index 397b88661..d20125972 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -18,8 +18,8 @@ if "" == "%JAVAC%"                        set JAVAC=%JAVA_HOME%\bin\javac
 echo.
 echo ... Bootstrapping Ant Distribution
 
-if exist lib\ant.jar erase lib\ant.jar
-if exist lib\optional.jar erase lib\optional.jar
+if     "%OS%" == "Windows_NT" if exist bootstrap rmdir/s/q bootstrap
+if not "%OS%" == "Windows_NT" if exist bootstrap deltree/y bootstrap
 
 SET LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar
 
diff --git a/bootstrap.sh b/bootstrap.sh
index b52642b74..276769811 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -39,11 +39,8 @@ fi
 
 echo ... Bootstrapping Ant Distribution
 
-if [ -f "lib/ant.jar" ] ; then
-  rm lib/ant.jar
-fi
-if [ -f "lib/optional.jar" ] ; then
-  rm lib/optional.jar
+if [ -d "bootstrap" ] ; then
+  rm -r bootstrap
 fi
 
 CLASSPATH=lib/parser.jar:lib/jaxp.jar:${CLASSPATH}
diff --git a/build.sh b/build.sh
index 78afed0d3..b8284b272 100755
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,16 @@
 #!/bin/sh
 
 REALANTHOME=$ANT_HOME
-ANT_HOME=.
+ANT_HOME=bootstrap
 export ANT_HOME
 
 if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
   /bin/sh ./bootstrap.sh
 fi    
 
+CLASSPATH=$CLASSPATH:lib/parser.jar:lib/jaxp.jar
+export CLASSPATH
+
 if [ "$REALANTHOME" != "" ] ; then
   ANT_INSTALL="-Dant.install=$REALANTHOME"
 fi