diff --git a/src/main/org/apache/tools/ant/types/resources/MappedResource.java b/src/main/org/apache/tools/ant/types/resources/MappedResource.java
index 3b88b655b..b153e2b23 100644
--- a/src/main/org/apache/tools/ant/types/resources/MappedResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/MappedResource.java
@@ -30,7 +30,7 @@ import org.apache.tools.ant.util.FileNameMapper;
  * dynamically remap the resource's name.
  *
  * <p>Strips the FileProvider interface from decorated resources since
- * it may be used to circomvent name mapping.</p>
+ * it may be used to circumvent name mapping.</p>
  *
  * <p>Overwrites all setters to throw exceptions.</p>
  *
diff --git a/src/tests/antunit/taskdefs/zip-test.xml b/src/tests/antunit/taskdefs/zip-test.xml
index a6647a963..d617be899 100644
--- a/src/tests/antunit/taskdefs/zip-test.xml
+++ b/src/tests/antunit/taskdefs/zip-test.xml
@@ -27,4 +27,37 @@
     <unzip src="${output}/test.zip" dest="${output}/bar"/>
     <au:assertFileExists file="${output}/bar/foo"/>
   </target>
+
+  <target name="testMappedResources">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}/out"/>
+    <echo file="${input}/foo.txt">Hello, world!</echo>
+    <zip destfile="${output}/test.zip">
+      <mappedresources>
+        <fileset dir="${input}"/>
+        <globmapper from="foo.*" to="bar.*"/>
+      </mappedresources>
+    </zip>
+    <unzip src="${output}/test.zip" dest="${output}/out"/>
+    <au:assertFileDoesntExist file="${output}/out/foo.txt"/>
+    <au:assertFileExists file="${output}/out/bar.txt"/>
+    <au:assertFilesMatch expected="${input}/foo.txt"
+                         actual="${output}/out/bar.txt"/>
+  </target>
+
+  <target name="testMappedClasspath">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}/out"/>
+    <zip destfile="${output}/test.zip">
+      <mappedresources>
+        <path path="${java.class.path}"/>
+        <chainedmapper>
+          <flattenmapper/>
+          <globmapper from="*" to="WEB-INF/lib/*"/>
+        </chainedmapper>
+      </mappedresources>
+    </zip>
+    <unzip src="${output}/test.zip" dest="${output}/out"/>
+    <au:assertFileExists file="${output}/out/WEB-INF/lib/ant.jar"/>
+  </target>
 </project>