diff --git a/docs/index.html b/docs/index.html
index 0534af4fa..bc301509b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -521,7 +521,7 @@ If you do not want these default excludes applied, you may disable them with the
   <li><a href="#deltree">Deltree</a></li>
   <li><a href="#echo">Echo</a></li>
   <li><a href="#exec">Exec</a></li>
-  <li><a href="#expand">Expand</a></li>
+  <li><a href="#unzip">Expand</a></li>
   <li><a href="#filter">Filter</a></li>
   <li><a href="#fixcrlf">FixCRLF</a></li>
   <li><a href="#get">Get</a></li>
@@ -544,7 +544,9 @@ If you do not want these default excludes applied, you may disable them with the
   <li><a href="#touch">Touch</a></li>
   <li><a href="#tstamp">Tstamp</a></li>
   <li><a href="#style">Style</a></li>
+  <li><a href="#unzip">Unjar</a></li>
   <li><a href="#untar">Untar</a></li>
+  <li><a href="#unzip">Unzip</a></li>
   <li><a href="#zip">Zip</a></li>
 </ul>
 <hr>
@@ -1101,11 +1103,13 @@ systems.</p>
   output=&quot;dir.txt&quot; /&gt;</code></p>
 </blockquote>
 <hr>
-<h2><a name="expand">Expand</a></h2>
+<h2><a name="unzip">Expand/Unzip/Unjar</a></h2>
 <h3>Description</h3>
-<p>Unzips a zipfile.</p>
+<p>Unzips a zip- or jarfile.</p>
 <p>For JDK 1.1 "last modified time" field is set to current time instead of being 
 carried from zipfile.</p>
+<p>DEPRECATION: the expand task simply points to the unzip task and it's
+there for back compatibility reasons.</p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
@@ -1126,7 +1130,7 @@ carried from zipfile.</p>
 </table>
 <h3>Examples</h3>
 <blockquote>
-  <p><code>&lt;expand src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;
+  <p><code>&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;
   /&gt;</code></p>
 </blockquote>
 <hr>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index 1b6b5c201..4edee4fd5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -74,6 +74,11 @@ public class Expand extends Task {
      */
     // XXX move it to util or tools
     public void execute() throws BuildException {
+        if ("expand".equals(taskType)) {
+            log("!! expand is deprecated. Use unzip instead. !!");
+        }
+        
+
         Touch touch = (Touch) project.createTask("touch");
         touch.setOwningTarget(target);
         
diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index 2bfce266a..e7bb1af2d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -10,7 +10,8 @@ copyfile=org.apache.tools.ant.taskdefs.Copyfile
 rmic=org.apache.tools.ant.taskdefs.Rmic
 cvs=org.apache.tools.ant.taskdefs.Cvs
 get=org.apache.tools.ant.taskdefs.Get
-expand=org.apache.tools.ant.taskdefs.Expand
+unzip=org.apache.tools.ant.taskdefs.Expand
+unjar=org.apache.tools.ant.taskdefs.Expand
 echo=org.apache.tools.ant.taskdefs.Echo
 javadoc=org.apache.tools.ant.taskdefs.Javadoc
 zip=org.apache.tools.ant.taskdefs.Zip
@@ -47,3 +48,4 @@ wlstop=org.apache.tools.ant.taskdefs.optional.ejb.WLStop
 # deprecated ant tasks (kept for back compatibility)
 javadoc2=org.apache.tools.ant.taskdefs.Javadoc
 keysubst=org.apache.tools.ant.taskdefs.KeySubst
+expand=org.apache.tools.ant.taskdefs.Expand