diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index 9c04392317..6a54ffbffd 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveDataTypeable CPP #-}
 
 module Assistant.Threads.Watcher (
 	watchThread,
@@ -146,6 +146,9 @@ ignored = ig . takeFileName
 	ig ".git" = True
 	ig ".gitignore" = True
 	ig ".gitattributes" = True
+#ifdef darwin_HOST_OS
+	ig ".DS_Store" = True
+#endif
 	ig _ = False
 
 type Handler = FilePath -> Maybe FileStatus -> Assistant (Maybe Change)
diff --git a/debian/changelog b/debian/changelog
index d7b89c2dde..2bab763b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ git-annex (3.20130125) UNRELEASED; urgency=low
   * annex.autocommit: New setting, can be used to disable autocommit
     of changed files by the assistant, while it still does data syncing
     and other tasks.
+  * assistant: Ignore .DS_Store on OSX.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Jan 2013 15:48:40 +1100
 
diff --git a/doc/bugs/DS__95__Store_not_gitignored.mdwn b/doc/bugs/DS__95__Store_not_gitignored.mdwn
index 3de5a6a782..269eb417aa 100644
--- a/doc/bugs/DS__95__Store_not_gitignored.mdwn
+++ b/doc/bugs/DS__95__Store_not_gitignored.mdwn
@@ -18,3 +18,9 @@ OS X Lion
 
 Please provide any additional information below.
 
+> Assistant does not support .gitignore yet. Requires an efficient query
+> interface for ignores, which git does not provide.
+>
+> However, I've added a special case, OSX only ignore for .DS_Store files.
+> [[done]] --[[Joey]] 
+