diff --git a/WHATSNEW b/WHATSNEW
index ac84acb29..c1f754be2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,5 +1,11 @@
 Changes from Ant 1.5 to current CVS version
-==============================================
+===========================================
+
+Fixed bugs:
+-----------
+
+* The sh wrapper script didn't work under Cygwin if ANT_HOME wasn't
+  set with a Unix style filename.
 
 Other changes:
 --------------
@@ -13,6 +19,8 @@ properties files and output them instead of Ant's properties.
 
 * <input> has a new attribute that allows you to specify a default value.
 
+* All tasks can be used outside of <target>s
+
 Changes from Ant 1.5beta3 to Ant 1.5
 ====================================
 
diff --git a/build.xml b/build.xml
index 9ba2a952e..98389d800 100644
--- a/build.xml
+++ b/build.xml
@@ -349,6 +349,7 @@
     <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
     <available property="jdk1.3+" classname="java.lang.StrictMath" />
     <available property="jdk1.4+" classname="java.lang.CharSequence" />
+    <available property="kaffe" classname="kaffe.util.NotImplemented" />
     <available property="bsf.present"
                classname="com.ibm.bsf.BSFManager"
                classpathref="classpath" />
@@ -512,7 +513,12 @@
 
     <condition property="swing.present">
       <or>
-        <isset property="jdk1.2+" />
+        <and>
+          <isset property="jdk1.2+" />
+          <not>
+            <isset property="kaffe" />
+          </not>
+        </and>
         <available classname="javax.swing.ImageIcon"
                    classpathref="classpath"/>
       </or>