diff --git a/WHATSNEW b/WHATSNEW
index 8a86a74ac..0fbf10cbf 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -241,6 +241,8 @@ Other changes:
 * Pathconvert no longer requires that one of (targetos|pathsep|dirsep)
   be set; platform defaults are used when this is the case.
 
+* Added preservelastmodified attribute to fixcrlf task. Bugzilla 25770.
+
 Fixed bugs:
 -----------
 
diff --git a/docs/manual/CoreTasks/fixcrlf.html b/docs/manual/CoreTasks/fixcrlf.html
index 78ff157dd..a33166497 100644
--- a/docs/manual/CoreTasks/fixcrlf.html
+++ b/docs/manual/CoreTasks/fixcrlf.html
@@ -231,6 +231,12 @@ supports all attributes of <code>&lt;fileset&gt;</code>
                      of a processed file. (Since ant 1.6.1)</td>
     <td align="center">No - default is <i>true</i></td>
   </tr>
+  <tr>
+    <td valign="top">preservelastmodified</td>
+    <td valign="top">Whether to preserve the last modified
+                     date of source files. <b>Since ant 1.6.3</b></td>
+    <td align="center">No; default is <i>false</i></td>
+  </tr>
 </table>
 <h3>Examples</h3>
 <pre>  &lt;fixcrlf srcdir=&quot;${src}&quot;
@@ -283,7 +289,7 @@ EOF characters are left alone if run on
 DOS systems, and are removed if run on Unix systems.
 You never know what editor a user will use to browse README's.</p>
 <hr>
-<p align="center">Copyright &copy; 2000-2004 The Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2005 The Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index 823e58557..8fdf45795 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -170,4 +170,28 @@
     <fixcrlf file="input/longlines.crlf" srcdir="input" destdir="result"/>
   </target>
 
+  <target name="testPreserveLastModified" depends="init">
+    <fixcrlf file="input/longlines.crlf" destdir="result"
+             preservelastmodified="true" />
+    <fail>
+      <condition>
+        <not>
+          <uptodate srcfile="result/longlines.crlf"
+                    targetfile="input/longlines.crlf" />
+        </not>
+      </condition>
+    </fail>
+
+    <touch file="result/longlines.crlf" millis="0" />
+
+    <fixcrlf file="result/longlines.crlf" destdir="result" eol="lf"
+             preservelastmodified="true" />
+
+    <fileset id="fs" file="result/longlines.crlf">
+      <date when="equal" millis="0" />
+    </fileset>
+    <property name="fs" refid="fs" />
+    <fail unless="fs" />
+  </target>
+
 </project>
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index eaeb77adf..db6df3fdd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -118,6 +118,7 @@ public class FixCRLF extends MatchingTask {
     private int tabs;
     private boolean javafiles = false;
     private boolean fixlast = true;
+    private boolean preserveLastModified = false;
 
     private File srcDir;
     private File destDir = null;
@@ -318,6 +319,14 @@ public class FixCRLF extends MatchingTask {
         this.fixlast = fixlast;
     }
 
+    /**
+     * Set to true if keeping the last modified time as the original files.
+     * @since Ant 1.6.3
+     */
+    public void setPreserveLastModified(boolean preserve) {
+        preserveLastModified = preserve;
+    }
+
     /**
      * Executes the task.
      */
@@ -381,6 +390,7 @@ public class FixCRLF extends MatchingTask {
 
     private void processFile(String file) throws BuildException {
         File srcFile = new File(srcDir, file);
+        long lastModified = srcFile.lastModified();
         File destD = destDir == null ? srcDir : destDir;
         File tmpFile = null;
         BufferedWriter outWriter;
@@ -557,6 +567,10 @@ public class FixCRLF extends MatchingTask {
 
             if (destIsWrong) {
                 FILE_UTILS.rename(tmpFile, destFile);
+                if (preserveLastModified) {
+                    log("preserved lastModified", Project.MSG_DEBUG);
+                    FILE_UTILS.setFileLastModified(destFile, lastModified);
+                }
                 tmpFile = null;
             }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
index cc110918d..2653bbedf 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2004 The Apache Software Foundation
+ * Copyright  2001-2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -197,6 +197,10 @@ public class FixCrLfTest extends BuildFileTest {
         executeTarget("createParentDirs");
     }
 
+    public void testPreserveLastModified() {
+        executeTarget("testPreserveLastModified");
+    }
+
     public void assertEqualContent(File expect, File result)
         throws AssertionFailedError, IOException {
         if (!result.exists()) {