diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..06d085f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+.check-author.yml export-ignore
+.gitattributes export-ignore
+.github export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+build.default.properties export-ignore
+build.xml export-ignore
+phpunit.xml.dist export-ignore
+/tests export-ignore
+/specs export-ignore
diff --git a/.gitignore b/.gitignore
index 5000390..a4e22b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-/vendor/
-/bin/
-/.tx/
-/node_modules/
+# OS
+.DS_Store
+Thumbs.db
+.directory
 
-coverage.xml
+# IDEs 
+.buildpath
+.project
+.settings/
+.build/
+.external*/
+.idea/
+nbproject/
 
+# composer related
+vendor/
 composer.lock
+
+# build
+build/
+build.properties
+
+# Translations
+.tx