diff --git a/WHATSNEW b/WHATSNEW
index d6ca217fe..641200af0 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -16,6 +16,10 @@ Changes from Ant 1.3 to Ant 1.4
 
 Changes that could break older environments:
 --------------------------------------------
+* JUnitReport now uses the xalan redirect extension for multi-output.
+  With Xalan 1.2.2 it forces the use of bsf.jar in the classpath.
+  (Available in the xalan distribution). It is recommended to switch
+  to Xalan 2.x that do not need it.
 
 * Zip.setWhenempty() has changed its signature.
 
@@ -72,12 +76,30 @@ Changes that could break older environments:
   been configured from the build file. Custom tasks supporting nested elements 
   starting with the name configured will no longer function.  
 
+* The environment variable JAVACMD that can be used to specify the
+  java executable to Ant's wrapper scripts must not contain additional
+  command line parameters any longer - please use the environment
+  variable ANT_OPTS for such parameters now.
+  
+* Ant's wrapper scripts now quote the CLASSPATH environment variable, thus
+  supporting classpaths which refer to directories containing spaces. This means
+  that the CLASSPATH environment variable cannot have quotes. Any quotes should
+  be removed. This will not affect the operation of the CLASSPATH environment
+  variable in other contexts.
+
+* A delete task like
+  <delete includeEmptyFilesets="true">
+    <fileset dir="somedir" />
+  </delete>
+  will now remove "somedir" as well, unless there are still files left
+  in it (matched by the default excludes).
+
 Other changes:
 --------------
 
 * New tasks: ear, p4counter, record, cvspass, vsscheckin, vsscheckout,
   typedef, sleep, mimemail, set of tasks for Continuus/Synergy, dependset,
-  condition
+  condition, maudit, mmetrics, jpcoverage, jpcovreport, jpcovmerge
 
 * Ant now uses JAXP 1.1
 
@@ -227,6 +249,12 @@ Other changes:
 * Introduced the concept of <filtersets> to allow for more control in which 
   filters get applied in a <copy> or <move> operation.       
 
+* Added nowarn attribute to javac and deprecated the Jikes-magic property
+  build.compiler.warnings.
+  
+* The <depend> task cache format has changed and all dependency information is
+  now stored in a single file.
+
 Fixed bugs:
 -----------
 
diff --git a/build.xml b/build.xml
index 174646358..fb47c736e 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
   <property name="name" value="ant"/>
   <property name="version" value="1.5alpha"/>
 
-  <property name="debug" value="false" />
+  <property name="debug" value="true" />
   <property name="deprecation" value="false" />
   <property name="optimize" value="true" />
   <property name="junit.fork" value="false" />
@@ -58,6 +58,12 @@
   <path id="tests-classpath">
     <pathelement location="${build.classes}" />
     <pathelement location="${build.tests}" />
+    <!--
+        include the test source and test data dirs
+        so that we can pick resources via getResource(AsStream)
+     -->
+    <pathelement location="${tests.dir}"/>
+    <pathelement location="${tests.etc.dir}"/>
     <path refid="classpath" />
   </path>
 
@@ -100,6 +106,9 @@
     <available property="xalan.present" 
                classname="org.apache.xalan.xslt.XSLTProcessorFactory" 
                classpathref="classpath" />
+    <available property="xalan2.present" 
+               classname="org.apache.xalan.transformer.TransformerImpl" 
+               classpathref="classpath" />
     <available property="ejb.ejbc.present" 
                classname="weblogic.ejbc" 
                classpathref="classpath" />
@@ -145,6 +154,10 @@
     <available property="log4j.present"
                classname="org.apache.log4j.Category"
                classpathref="classpath"/>
+    <!-- this is just a way to check for a TraX implementation -->
+    <available property="trax.impl.present"
+               resource="META-INF/services/javax.xml.transform.TransformerFactory"
+               classpathref="classpath"/>
                
     <condition property="javamail.complete">
       <and>
@@ -622,6 +635,10 @@
                unless="jdk1.4+" />
       <exclude name="org/apache/tools/ant/taskdefs/optional/sitraka/*.java"
       				 unless="jakarta.oro.present" />
+      <exclude name="org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java" 
+               unless="xslp.present"/>
+      <exclude name="org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java" 
+               unless="xalan.present"/>
     </javac>
   </target>
 
@@ -687,6 +704,14 @@
            <!-- run when you have the environment setup to support them -->
           <exclude name="org/apache/tools/ant/taskdefs/optional/net/FtpTest.java" />
 
+          <!-- it's an abstract class, not a test -->
+          <exclude name="org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java" />
+          <exclude name="org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java" unless="xslp.present"/>
+          <exclude name="org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java" unless="xalan.present"/>
+          
+          <!-- ehm, this is not really a TraX test but rather a xalan2 test..-->
+          <exclude name="org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java" unless="xalan2.present"/>
+
         </fileset>
       </batchtest>
 
@@ -700,6 +725,9 @@
     <delete dir="${tests.etc.dir}/taskdefs.tmp" />
     <delete file="${tests.etc.dir}/taskdefs/tmp.jar" />
     <delete dir="${tests.etc.dir}/types/copytest" />
+    <!-- generated by testcases in jvm dir -->
+    <delete file="${user.dir}/xalan1-redirect-out.tmp" />
+    <delete file="${user.dir}/xalan2-redirect-out.tmp" />
   </target>
 
   <target name="run-single-test" if="testcase" depends="compile-tests">