diff --git a/src/etc/testcases/core/directoryscanner.xml b/src/etc/testcases/core/directoryscanner.xml
index 96af29fb8..90a6dca7f 100644
--- a/src/etc/testcases/core/directoryscanner.xml
+++ b/src/etc/testcases/core/directoryscanner.xml
@@ -1,9 +1,6 @@
 <project name="directoryscanner-test" basedir=".">
     <property name="tmp.dir" location="tmp"/>
     <target name="setup">
-        <mkdir dir="${tmp.dir}"/>
-        <mkdir dir="${tmp.dir}/alpha"/>
-        <mkdir dir="${tmp.dir}/alpha/beta"/>
         <mkdir dir="${tmp.dir}/alpha/beta/gamma"/>
         <touch file="${tmp.dir}/alpha/beta/gamma/gamma.xml"/>
         <touch file="${tmp.dir}/alpha/beta/beta.xml"/>
@@ -11,4 +8,11 @@
     <target name="cleanup">
         <delete dir="${tmp.dir}" quiet="true"/>
     </target>
+
+    <target name="symlink-setup" depends="setup">
+        <mkdir dir="${tmp.dir}/epsilon/gamma"/>
+        <delete dir="${tmp.dir}/alpha/beta"/>
+        <symlink link="${tmp.dir}/alpha/beta" resource="${tmp.dir}/epsilon"/>
+        <touch file="${tmp.dir}/alpha/beta/gamma/gamma.xml"/>
+    </target>
 </project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
index 6889ee3d7..b8e28c51e 100644
--- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -144,6 +144,34 @@ public class DirectoryScannerTest extends BuildFileTest {
                      new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
     }
 
+    public void testAllowSymlinks() {
+        if (!supportsSymlinks) {
+            return;
+        }
+        
+        getProject().executeTarget("symlink-setup");
+        DirectoryScanner ds = new DirectoryScanner();
+        ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+        ds.setIncludes(new String[] {"alpha/beta/gamma/"});
+        ds.scan();
+        compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
+                     new String[] {"alpha/beta/gamma"});
+    }
+
+    public void testProhibitSymlinks() {
+        if (!supportsSymlinks) {
+            return;
+        }
+        
+        getProject().executeTarget("symlink-setup");
+        DirectoryScanner ds = new DirectoryScanner();
+        ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+        ds.setIncludes(new String[] {"alpha/beta/gamma/"});
+        ds.setFollowSymlinks(false);
+        ds.scan();
+        compareFiles(ds, new String[] {}, new String[] {});
+    }
+
     // father and child pattern test
     public void testOrderOfIncludePatternsIrrelevant() {
         String [] expectedFiles = {"alpha/beta/beta.xml",