diff --git a/CakePHP.gitignore b/CakePHP.gitignore
index 55a665e4..c6597e4e 100644
--- a/CakePHP.gitignore
+++ b/CakePHP.gitignore
@@ -2,8 +2,20 @@
 
 /vendor/*
 /config/app.php
-/tmp/*
+
+/tmp/cache/models/*
+!/tmp/cache/models/empty
+/tmp/cache/persistent/*
+!/tmp/cache/persistent/empty
+/tmp/cache/views/*
+!/tmp/cache/views/empty
+/tmp/sessions/*
+!/tmp/sessions/empty
+/tmp/tests/*
+!/tmp/tests/empty
+
 /logs/*
+!/logs/empty
 
 # CakePHP 2