diff --git a/build.xml b/build.xml
index 2a2703a..20fe6e4 100644
--- a/build.xml
+++ b/build.xml
@@ -391,7 +391,6 @@ $Id$
       <exclude name="**/IncrementalSAXSource_Xerces.java" 
         unless="xerces.present"	 />
       <classpath refid="compile.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
     <copy todir="${build.classes}">
@@ -407,6 +406,12 @@ $Id$
   <!-- =================================================================== -->
   <target name="xalan-interpretive.compile" depends="xml.compile"
     description="Compile the Xalan interpretive classes (skips XSLTC)" >
+
+    <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />
+    <untar src="${xml-commons-srcs.tar}"
+           dest="${src.dir}">
+    </untar>
+
     <echo message="Compiling Xalan interpretive classes" />
     <javac srcdir="${src.dir}" 
            destdir="${build.classes}"
@@ -418,7 +423,6 @@ $Id$
       <include name="${xalan.reldir}/**/*.java" />
       <exclude name="${xsltc.reldir}/**/*.java" />
       <classpath refid="compile.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
       <sourcepath refid="compile.source.path" />
     </javac>
     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
@@ -461,7 +465,6 @@ $Id$
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="xsltc.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
     <!-- These tricky uptodate statements hopefully determine if we 
          actually need to generate the java_cup and jlex files 
@@ -526,7 +529,6 @@ $Id$
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}"> 
       <classpath refid="xsltc.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
   </target>
 
@@ -541,7 +543,6 @@ $Id$
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="xsltc.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
   </target>
 
@@ -740,104 +741,104 @@ $Id$
     <!-- Since the samples are packageless, they must be compiled separately. -->   
     <javac srcdir="${samples.dir}/SimpleTransform" 
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseStylesheetPI"   
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseStylesheetParam" 
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/SAX2SAX"  
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/DOM2DOM"  
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Pipe"  
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseXMLFilters"  
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Trace"   
            destdir="${build.samples}"  excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/ApplyXPath"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>
     <javac srcdir="${samples.dir}/ApplyXPathDOM"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>             
     <javac srcdir="${samples.dir}/trax"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/extensions"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Validate"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac> 
     <javac srcdir="${samples.dir}/TransformThread"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
     </javac>
     <javac srcdir="${samples.dir}/XPathAPI"  
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
       <classpath refid="samples.class.path" />
@@ -881,7 +882,6 @@ $Id$
      <javac srcdir="${samples.dir}/servlet"
             destdir="${build.servlet}/WEB-INF/classes"
             debug="${build.debug}"
-            bootclasspathref="xslt.boot.class.path" 
      	    target="${compiler.target}" source="${compiler.source}" 
      	    nowarn="${compiler.nowarn}">
         <classpath refid="samples.class.path" />
@@ -924,12 +924,12 @@ $Id$
     <javac srcdir="${samples.dir}/translets"
            classpath="${build.xalan.jar}" 
            destdir="${build.samples}" excludes="${exclude}" 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}" 
   	       target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}"/>
     <javac srcdir="${samples.dir}/CompiledJAXP"
            destdir="${build.samples}" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}" 
   	       target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}"/>
   </target>
@@ -943,7 +943,7 @@ $Id$
     <mkdir dir="${build.samples}/CompiledApplet"/>
     <javac srcdir="${samples.dir}/CompiledApplet"
            destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}"/>
     <jar jarfile="${build.xsltc.applet.jar}"
@@ -960,7 +960,7 @@ $Id$
     <mkdir dir="${build.samples}/CompiledBrazil"/>
     <javac srcdir="${samples.dir}/CompiledBrazil"
            destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
     	<classpath location="${brazil.jar}"/>
@@ -981,7 +981,7 @@ $Id$
     <mkdir dir="${build.samples}/CompiledEJB"/>
     <javac srcdir="${samples.dir}/CompiledEJB"
            destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   nowarn="${compiler.nowarn}">
     	<classpath location="${javaee-api.jar}"/>
@@ -1000,7 +1000,7 @@ $Id$
     <mkdir dir="${build.samples}/CompiledServlet"/>
     <javac srcdir="${samples.dir}/CompiledServlet"
            destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   classpath="${build.xalan.jar}:${servlet-api.jar}" 
     	   nowarn="${compiler.nowarn}">
@@ -1760,7 +1760,6 @@ $Id$
     	   nowarn="${compiler.nowarn}">
       <include name="${serializer.reldir}/**/*.java" />
       <classpath refid="compile.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
     <copy todir="${serializer.build.classes}">