diff --git a/build.bat b/build.bat
index 220fdceb9..98d535705 100755
--- a/build.bat
+++ b/build.bat
@@ -7,7 +7,10 @@ if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap
 call bootstrap.bat
 
 :runAnt
-set CLASSPATH=bootstrap\lib\ant.jar;lib\parser.jar;lib\jaxp.jar;%CLASSPATH%
+set LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar
+for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat "%%i"
+set CLASSPATH=%LOCALCLASSPATH%;%CLASSPATH%
+
 if not "%REAL_ANT_HOME%" == "" goto install_ant
 call bootstrap\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
 goto cleanup
diff --git a/build.sh b/build.sh
index b8284b272..9e1725786 100755
--- a/build.sh
+++ b/build.sh
@@ -8,9 +8,20 @@ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/
   /bin/sh ./bootstrap.sh
 fi    
 
-CLASSPATH=$CLASSPATH:lib/parser.jar:lib/jaxp.jar
+LOCALCLASSPATH=lib/parser.jar:lib/jaxp.jar
+# add in the dependency .jar files
+DIRLIBS=lib/optional/*.jar
+for i in ${DIRLIBS}
+do
+    if [ "$i" != "${DIRLIBS}" ] ; then
+        LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
+    fi
+done
+
+CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
 export CLASSPATH
 
+
 if [ "$REALANTHOME" != "" ] ; then
   ANT_INSTALL="-Dant.install=$REALANTHOME"
 fi
diff --git a/build.xml b/build.xml
index 61385c154..4ff5ee6bd 100644
--- a/build.xml
+++ b/build.xml
@@ -429,9 +429,8 @@
          Cleans up build and distribution directories
        ===================================================================
   -->
-  <target name="clean" depends="setup-distproperties">
+  <target name="clean">
     <delete dir="${build.dir}" />
-    <delete dir="${dist.dir}" />
     <delete dir="${dist.base}" />
     <delete> 
       <fileset dir="." includes="**/*~" defaultexcludes="no"/>