diff --git a/.gitignore b/.gitignore
index 69317f821..281515e95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,12 @@ Thumbs.db
 *.orig
 *~
 
+# tmp filesystem
+/tmp/cache/*
+/tmp/locks/*
+!/tmp/cache/.gitkeep
+!/tmp/locks/.gitkeep
+
 #vichan custom
 favicon.ico
 /static/spoiler.png