diff --git a/docs/index.html b/docs/index.html
index 6fe258afb..67aef88a5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -732,7 +732,7 @@ They are:
         "**/#*#",
         "**/%*%",
         "**/CVS",
-        "**/CVS/*",
+        "**/CVS/**",
         "**/.cvsignore"
 </pre>
 If you do not want these default excludes applied, you may disable them with the 
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index eb46a7762..af5550324 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -145,7 +145,7 @@ public class DirectoryScanner implements FileScanner {
         "**/#*#",
         "**/%*%",
         "**/CVS",
-        "**/CVS/*",
+        "**/CVS/**",
         "**/.cvsignore"
     };