diff --git a/.gitignore b/.gitignore
index 5c2c63764..6203373e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
-/tmp
+/tmp/*
 
 # Ignore .project files
 /.project
diff --git a/tmp/README b/tmp/README
new file mode 100644
index 000000000..e69de29bb