diff --git a/.gitignore b/.gitignore
index b9448fcb49..019903ce93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,6 @@
 /nbproject
-/config/custom_files
-/config/templates
-/config/topics
-/config/wm
-/config/minilogos
-/config/status
-/config/stamp
-/config/configuration.yml
+/config
+!/config/configuration.sample.yml
 .DS_Store
 /vendor
 /plugins
@@ -16,3 +10,8 @@ behat.yml
 /www/assets
 /www/skins/build
 /www/crossdomain.xml
+/www/plugins
+/bin
+!/bin/console
+!/bin/developer
+!/bin/setup
diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore
new file mode 100644
index 0000000000..d96f05db68
--- /dev/null
+++ b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore
@@ -0,0 +1,2 @@
+!.gitignore
+!insecure_private_key