diff --git a/.gitattributes b/.gitattributes
index 1012087d4713eeeed96628ad8638ad419115f81a..6beb1fb7a7b4a9e58415a5d82f6ab073654e51a3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,8 @@
 .gitignore export-ignore
 .editorconfig export-ignore
 .travis.yml export-ignore
+composer.json export-ignore
+composer.lock export-ignore
 _test export-ignore
 _cs export-ignore
 lib/plugins/testing export-ignore
diff --git a/.gitignore b/.gitignore
index d28991d9c6f2720548545c53b55a2bac0ec7b49c..a8962d0bc6fad593e88dbaded78161ee8fe5f7ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@
 lib/images/*/local/*
 
 # composer default ignores
+composer.phar
+vendor/bin/*
+vendor/*/*/bin/*
 vendor/*/*/tests/*
 vendor/*/*/test/*
 vendor/*/*/doc/*