diff --git a/build.bat b/build.bat
index 9e92a6985..4025d28dc 100755
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ echo Bootstrap FAILED
 goto cleanup
 
 :runAnt
-set LOCALCLASSPATH=lib/xercesImpl.jar;lib/xml-apis.jar
+set LOCALCLASSPATH=
 for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
 set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
 set LOCALCLASSPATH=
diff --git a/build.sh b/build.sh
index 6f04697ac..142a49f72 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ case "`uname`" in
   CYGWIN*) cygwin=true ;;
   Darwin*) darwin=true
            if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home   
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
            fi
            ;;
 esac
@@ -21,14 +21,14 @@ 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    
+fi
 
 if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
   echo Bootstrap FAILED
   exit
 fi
 
-LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar
+LOCALCLASSPATH=
 # add in the dependency .jar files
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}
@@ -40,14 +40,14 @@ done
 
 # make sure the classpath is in unix format
 if $cygwin ; then
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`    
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
 CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
 
 # switch back to Windows format
 if $cygwin ; then
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`    
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
 fi
 
 export CLASSPATH
@@ -62,5 +62,5 @@ else
   ANT_INSTALL="-emacs"
 fi
 
-bootstrap/bin/ant -emacs "$ANT_INSTALL" $*
+bootstrap/bin/ant "$ANT_INSTALL" $*
 
diff --git a/build.xml b/build.xml
index 9f90a09fb..02397e857 100644
--- a/build.xml
+++ b/build.xml
@@ -1009,6 +1009,13 @@
       </fileset>
     </copy>
 
+    <copy todir="${dist.lib}">
+      <fileset dir="${lib.dir}">
+        <include name="*.jar"/>
+        <include name="*.zip"/>
+      </fileset>
+    </copy>
+
     <copy todir="${dist.bin}">
       <fileset dir="${script.dir}/"/>
     </copy>
@@ -1058,13 +1065,6 @@
     <mkdir dir="${dist.docs}"/>
     <mkdir dir="${dist.etc}"/>
 
-    <copy todir="${dist.lib}">
-      <fileset dir="${lib.dir}">
-        <include name="*.jar"/>
-        <include name="*.zip"/>
-      </fileset>
-    </copy>
-
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
 
     <copy todir="${dist.docs}">