diff --git a/.gitignore b/.gitignore
index 4befed3..a37967d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,33 @@
+# User specific & automatically generated files #
+#################################################
+build/
+dist/
+tags/
+composer.lock
+phpunit.xml
+vendor/
+*.mo
+debug.log
+error.log
+/tests/test_app/config/Create/*
+/tests/test_app/config/Migrations/*
+/tests/test_app/config/TestsMigrations/schema-dump-test.lock
+/tests/test_app/Plugin/TestBlog/config/Migrations/*
+.phpunit.result.cache
+
+# IDE and editor specific files #
+#################################
+nbproject/
+.idea/
+
+# OS generated files #
+######################
 .DS_Store
-.idea
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+/cakephp_test