diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index f3628b6e1..8cf1b6838 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -658,6 +658,7 @@ public class DirectoryScanner
             dirsNotIncluded.addElement("");
         }
         checkIncludePatterns();
+        clearCaches();
     }
 
     /**
@@ -675,6 +676,12 @@ public class DirectoryScanner
             newroots.put(newpattern, includes[icounter]);
         }
 
+        if (newroots.containsKey("")) {
+            // we are going to scan everything anyway
+            scandir(basedir, "", true);
+        } else {
+            // only scan directories that can include matched files or
+            // directories
         Enumeration enum2 = newroots.keys();
 
         File canonBase = null;
@@ -750,7 +757,7 @@ public class DirectoryScanner
                 }
             }
         }
-        clearCaches();
+        }
     }
 
     /**