diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
index e82e11d6e6..2a46f83b49 100644
--- a/Library/Homebrew/cmd/cleanup.rb
+++ b/Library/Homebrew/cmd/cleanup.rb
@@ -17,6 +17,7 @@ module Homebrew extend self
       clean_cache
       # seems like a good time to do some additional cleanup
       Homebrew.prune unless ARGV.dry_run?
+      rm_DS_Store
     else
       ARGV.formulae.each do |f|
         cleanup_formula f
@@ -65,4 +66,8 @@ module Homebrew extend self
     end
   end
 
+  def rm_DS_Store
+    system "find #{HOMEBREW_PREFIX} -name .DS_Store -delete"
+  end
+
 end