diff --git a/.gitignore b/.gitignore
index de74c07eb..81d0381da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 .bundle
 db/*.sqlite3
 log/*.log
-tmp/**/*
+tmp/cache
+tmp/pids
+tmp/sass-cache
 
 log/searchd.development.pid
 config/database.yml
@@ -18,4 +20,4 @@ public/sitemap.xml
 public/sitemap*.xml.gz
 public/javascripts/all.js
 public/javascripts/mxn_bundle.js
-webrat.log
\ No newline at end of file
+webrat.log
diff --git a/tmp/cache/.gitkeep b/tmp/cache/.gitkeep
new file mode 100644
index 000000000..e69de29bb