diff --git a/WHATSNEW b/WHATSNEW
index eba43380f..ef122b737 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -98,6 +98,8 @@ Fixed bugs:
 
 Other changes:
 --------------
+* **/.DS_Store has been added to the list of default pattern excludes.
+
 * The filesetmanifest attribute of <jar> has been reenabled.
 
 * The start and end tokens for <translate> may now be longer than a
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index ee4e71908..58f793862 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -163,6 +163,7 @@ They are:</p>
      **/vssver.scc
      **/.svn
      **/.svn/**
+     **/.DS_Store
 </pre>
 <p>If you do not want these default excludes applied, you may disable them with the
 <code>defaultexcludes=&quot;no&quot;</code> attribute.</p>
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 27057bdc1..962cb413d 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -157,19 +157,31 @@ public class DirectoryScanner implements FileScanner, SelectorScanner {
      * @see #addDefaultExcludes()
      */
     protected static final String[] DEFAULTEXCLUDES = {
+        // Miscellaneous typical temporary files
         "**/*~",
         "**/#*#",
         "**/.#*",
         "**/%*%",
         "**/._*",
+
+        // CVS
         "**/CVS",
         "**/CVS/**",
         "**/.cvsignore",
+
+        // SCCS
         "**/SCCS",
         "**/SCCS/**",
+
+        // Visual SourceSafe
         "**/vssver.scc",
+
+        // Subversion
         "**/.svn",
-        "**/.svn/**"
+        "**/.svn/**",
+
+        // Mac
+        "**/.DS_Store"
     };
 
     /** The base directory to be scanned. */