diff --git a/build.xml b/build.xml
index 310e3929c..09e9ff735 100644
--- a/build.xml
+++ b/build.xml
@@ -630,13 +630,18 @@
           <exclude name="org/apache/tools/ant/taskdefs/GUnzipTest.java" />
           <exclude name="org/apache/tools/ant/taskdefs/GzipTest.java" />
 
-          <!-- only run this test if ANTLR is installed -->
+          <!-- only run these tests if their required libraries are installed -->
           <exclude name="org/apache/tools/ant/taskdefs/optional/ANTLRTest.java" 
                    unless="antlr.present" />
           <exclude name="org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java" 
                    unless="jakarta.regexp.present" />
           <exclude name="org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java" 
                    unless="jakarta.oro.present" />
+          <exclude name="${optional.package}/ide/VAJExportTest.java" unless="vaj.present" />
+                   
+           <!-- run when you have the environment setup to support them -->
+          <exclude name="org/apache/tools/ant/taskdefs/optional/net/FtpTest.java" />
+
         </fileset>
       </batchtest>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index 465e738c6..36d880f54 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -238,9 +238,9 @@ public class FixCRLF extends MatchingTask {
 
         // log options used
         log("options:" +
-            " cr=" + (addcr==-1 ? "add" : addcr==0 ? "asis" : "remove") +
-            " tab=" + (addtab==-1 ? "add" : addtab==0 ? "asis" : "remove") +
-            " eof=" + (ctrlz==-1 ? "add" : ctrlz==0 ? "asis" : "remove") +
+            " cr=" + (addcr==1 ? "add" : addcr==0 ? "asis" : "remove") +
+            " tab=" + (addtab==1 ? "add" : addtab==0 ? "asis" : "remove") +
+            " eof=" + (ctrlz==1 ? "add" : ctrlz==0 ? "asis" : "remove") +
             " tablength=" + tablength,
             Project.MSG_VERBOSE);
 
@@ -363,11 +363,54 @@ public class FixCRLF extends MatchingTask {
 
             // output the data
             try {
+                // Determine whether it should be written,
+                // that is if it is different than the potentially already existing file
+                boolean write = false;
+                byte[] existingdata = indata;
                 File destFile = srcFile;
-                if (destDir != null) destFile = new File(destDir, files[i]);
-                FileOutputStream outStream = new FileOutputStream(destFile);
-                outStream.write(outdata,0,o);
-                outStream.close();
+                if (destDir != null) {
+                    destFile = new File(destDir, files[i]);
+                    if(destFile.isFile()) {
+                        int len = (int)destFile.length();
+                        if(len != o) {
+                            write = true;
+                        } else {
+                            existingdata = new byte[len];
+                            try {
+                                FileInputStream in = new FileInputStream(destFile);
+                                in.read(existingdata);
+                                in.close();
+                            } catch (IOException e) {
+                                throw new BuildException(e);
+                            }
+                        }
+                    } else {
+                        write = true;
+                    }
+                }
+
+                if(!write) {
+                    if(existingdata.length != o) {
+                        write = true;
+                    } else {
+                        for(int j = 0; j < o; ++j) {
+                            if(existingdata[j] != outdata[j]) {
+                                write = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if(write) {
+                    log(destFile + " is being written", Project.MSG_VERBOSE);
+                    FileOutputStream outStream = new FileOutputStream(destFile);
+                    outStream.write(outdata,0,o);
+                    outStream.close();
+                } else {
+                    log(destFile + " is not written, as the contents are identical",
+                        Project.MSG_VERBOSE);
+                }
             } catch (IOException e) {
                 throw new BuildException(e);
             }