diff --git a/src/etc/testcases/taskdefs/touch.xml b/src/etc/testcases/taskdefs/touch.xml
index d44b33b8d..dfee38ec7 100644
--- a/src/etc/testcases/taskdefs/touch.xml
+++ b/src/etc/testcases/taskdefs/touch.xml
@@ -83,6 +83,38 @@
 
   </target>
 
+  <target name="testExplicitMappedFileset">
+    <touch file="touchtest" millis="${mappermillis}" />
+    <touch>
+      <fileset file="touchtest" />
+      <mapper>
+        <compositemapper>
+          <globmapper from="*" to="*foo" />
+          <globmapper from="*" to="*bar" />
+        </compositemapper>
+      </mapper>
+    </touch>
+
+    <fail>
+      <condition>
+        <not>
+          <and>
+            <isfileselected file="touchtest">
+              <selector refid="map.selector" />
+            </isfileselected>
+            <isfileselected file="touchtestfoo">
+              <selector refid="map.selector" />
+            </isfileselected>
+            <isfileselected file="touchtestbar">
+              <selector refid="map.selector" />
+            </isfileselected>
+          </and>
+        </not>
+      </condition>
+    </fail>
+
+  </target>
+
   <target name="testMappedFilelist">
     <touch millis="${mappermillis}">
       <filelist dir="." files="idonotexist" />
diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java
index 3438f9c82..a61ffb6c2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Touch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java
@@ -168,7 +168,7 @@ public class Touch extends Task {
      * @param mapper the <code>Mapper</code> to add.
      * @since Ant 1.6.3
      */
-    public void addMapper(Mapper mapper) {
+    public void addConfiguredMapper(Mapper mapper) {
         add(mapper.getImplementation());
     }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java
index fe206724c..034071d70 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java
@@ -109,6 +109,13 @@ public class TouchTest extends BuildFileTest {
         executeTarget("testMappedFileset");
     }
 
+    /**
+     * test the explicit mapped file set
+     */
+    public void testExplicitMappedFileset() {
+        executeTarget("testExplicitMappedFileset");
+    }
+
     /**
      * test the mapped file list
      */