diff --git a/src/etc/testcases/taskdefs/copy.xml b/src/etc/testcases/taskdefs/copy.xml
index b3b6d9053..3de6f608d 100644
--- a/src/etc/testcases/taskdefs/copy.xml
+++ b/src/etc/testcases/taskdefs/copy.xml
@@ -201,6 +201,55 @@ a=b=
     </copy>
   </target>
 
+  <target name="prepareDirset">
+    <touch mkdirs="true">
+      <filelist dir="${from.dir}/dirset">
+        <file name="a/x/foo" />
+        <file name="a/y/foo" />
+        <file name="a/z/foo" />
+        <file name="b/x/foo" />
+        <file name="b/y/foo" />
+        <file name="b/z/foo" />
+      </filelist>
+    </touch>
+    <fail>
+      <condition>
+        <or>
+          <resourcecount when="ne" count="9">
+            <dirset id="dirset" dir="${from.dir}/dirset" />
+          </resourcecount>
+          <resourcecount when="ne" count="6">
+            <fileset dir="${from.dir}/dirset" />
+          </resourcecount>
+        </or>
+      </condition>
+    </fail>
+    <delete dir="${to.dir}/dirset" />
+    <fail>
+      <condition>
+        <available file="${to.dir}/dirset" />
+      </condition>
+    </fail>
+  </target>
+
+  <target name="testDirset" depends="prepareDirset">
+    <copy todir="${to.dir}/dirset">
+      <resources refid="dirset" />
+    </copy>
+    <fail>
+      <condition>
+        <or>
+          <resourcecount when="ne" count="9">
+            <dirset dir="${to.dir}/dirset" />
+          </resourcecount>
+          <resourcecount when="ne" count="0">
+            <fileset dir="${to.dir}/dirset" />
+          </resourcecount>
+        </or>
+      </condition>
+    </fail>
+  </target>
+
   <target name="cleanup">
     <delete file="copytest1.tmp"/>
     <delete file="copytest3.tmp"/>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
index 687fe6a38..7981ab795 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright 2000-2006 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.
@@ -206,6 +206,10 @@ public class CopyTest extends BuildFileTest {
         assertTrue(file2.exists());
         assertTrue(file3.exists());
     }
+
+    public void testDirset() {
+        executeTarget("testDirset");
+    }
     
     public void _testResourcePlain() {
         executeTarget("testResourcePlain");