diff --git a/bootstrap.sh b/bootstrap.sh
index 606f8a760..7c7d4d78d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,6 +4,11 @@ if [ -f $HOME/.antrc ] ; then
   . $HOME/.antrc
 fi
 
+if [ "$ANT_HOME" = "" ] ; then
+  ANT_HOME=`pwd`
+  export ANT_HOME
+fi
+
 SRCDIR=src/main/org/apache/tools
 CLASSDIR=classes
 
diff --git a/src/bin/ant b/src/bin/ant
index ab91889d3..8c67ed34b 100644
--- a/src/bin/ant
+++ b/src/bin/ant
@@ -43,10 +43,7 @@ if [ ! "$JAVA_HOME" = "" ] ; then
    CLASSPATH=${JAVA_HOME}/lib/classes.zip:$CLASSPATH
 fi
 
-
-CLASSPATH=${ANT_HOME}/lib/xml.jar:$CLASSPATH
 CLASSPATH=${ANT_HOME}/lib/ant.jar:$CLASSPATH
-CLASSPATH=${ANT_HOME}/lib/moo.jar:$CLASSPATH
 export CLASSPATH
 
 $JAVACMD -Dant.home=${ANT_HOME} org.apache.tools.ant.Main $@