diff --git a/WHATSNEW b/WHATSNEW
index 9abb94ef4..4f111d2a4 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -7,8 +7,12 @@ Changes that could break older environments:
 Other changes:
 --------------
 
-* The attributes zipfile, jarfile, warfile and earfile (from the Zip, Gzip, Jar, 
-  War and Ear tasks) have been deprecated and supersceded by a new attribute "file".
+* The attributes zipfile, jarfile, warfile and earfile (from the Zip, 
+  Jar, War and Ear tasks) have been deprecated and supersceded by a 
+  new attribute "file".
+
+* The attribute zipfile in GZip has been deprecated and supersceded 
+  by "tofile" attribute.
 
 Fixed bugs:
 -----------
diff --git a/build.xml b/build.xml
index 5a166a757..c00cb5510 100644
--- a/build.xml
+++ b/build.xml
@@ -514,7 +514,7 @@
         <exclude name="${dist.name}/lib/optional.jar"/>
       </tarfileset> 
     </tar>
-    <gzip file="${dist.base}/${dist.name}-bin.tar.gz" 
+    <gzip tofile="${dist.base}/${dist.name}-bin.tar.gz" 
           src="${dist.base}/${dist.name}-bin.tar"/>
     <delete file="${dist.base}/${dist.name}-bin.tar"/>
     <copy file="${dist.name}/lib/optional.jar" tofile="${dist.base}/${dist.name}-optional.jar"/>
@@ -539,7 +539,7 @@
         <exclude name="${dist.name}/build.sh"/>
       </tarfileset>
     </tar> 
-    <gzip file="${dist.base}/${dist.name}-src.tar.gz" 
+    <gzip tofile="${dist.base}/${dist.name}-src.tar.gz" 
           src="${dist.base}/${dist.name}-src.tar"/>
     <delete file="${dist.base}/${dist.name}-src.tar"/>
     <delete dir="${dist.name}" />
diff --git a/docs/manual/CoreTasks/gzip.html b/docs/manual/CoreTasks/gzip.html
index bde8d76a0..a0aa30c9d 100644
--- a/docs/manual/CoreTasks/gzip.html
+++ b/docs/manual/CoreTasks/gzip.html
@@ -23,14 +23,14 @@
     <td align="center" valign="top">Yes</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
+    <td valign="top">tofile</td>
     <td valign="top">the destination file.</td>
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>
 <h3>Examples</h3>
 <blockquote>
-  <p><code>&lt;gzip src=&quot;test.tar&quot; file=&quot;test.tar.gz&quot;
+  <p><code>&lt;gzip src=&quot;test.tar&quot; tofile=&quot;test.tar.gz&quot;
   /&gt;</code></p>
 </blockquote>
 <hr>
diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java
index 467c0eb3f..935b93ef9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GZip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GZip.java
@@ -72,13 +72,13 @@ public class GZip extends Task {
     private File zipFile;
     private File source;
     
-    public void setFile(File file) {
+    public void setTofile(File file) {
         zipFile = file;
     }
 
     public void setZipfile(File zipFile) {
-        log("DEPRECATED - The zipfile attribute is deprecated. Use file attribute instead.");
-        setFile( zipFile );
+        log("DEPRECATED - The zipfile attribute is deprecated. Use tofile attribute instead.");
+        setTofile( zipFile );
     }
 
     public void setSrc(File src) {