diff --git a/bootstrap.bat b/bootstrap.bat
index 4629190cb..120c085ff 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -29,7 +29,7 @@ if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\too
 if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip
 
 set TOOLS=src\main\org\apache\tools
-set CLASSDIR=classes
+set CLASSDIR=build\classes
 
 SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
 
@@ -41,7 +41,6 @@ echo CLASSPATH=%CLASSPATH%
 if     "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR%
 if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
 
-if not exist %CLASSDIR%\nul mkdir %CLASSDIR%
 if not exist build\nul mkdir build
 if not exist build\classes\nul mkdir build\classes
 
@@ -59,8 +58,6 @@ copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
 echo.
 echo ... Building Ant Distribution
 
-xcopy /s/q %CLASSDIR% build\classes
-
 "%JAVA%" %ANT_OPTS% org.apache.tools.ant.Main -emacs bootstrap
 
 echo.
diff --git a/bootstrap.sh b/bootstrap.sh
index 310b6979e..81bdc9898 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -81,7 +81,7 @@ do
 done
 
 TOOLS=src/main/org/apache/tools
-CLASSDIR=classes
+CLASSDIR=build/classes
 
 CLASSPATH=${CLASSDIR}:src/main:${CLASSPATH}
 
@@ -92,8 +92,8 @@ fi
 
 export CLASSPATH
 
-mkdir -p ${CLASSDIR}
 mkdir -p build
+mkdir -p ${CLASSDIR}
 mkdir -p bin
 
 echo ... Compiling Ant Classes
@@ -117,8 +117,6 @@ chmod +x bin/antRun
 
 echo ... Building Ant Distribution
 
-cp -r ${CLASSDIR} build
-
 "${JAVACMD}" -classpath "${CLASSPATH}" -Dant.home=. org.apache.tools.ant.Main -emacs bootstrap
 
 echo ... Cleaning Up Build Directories