diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6537ca4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index f0f02a5..2653f49 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,8 +6,9 @@
 /docs               export-ignore
 /tests              export-ignore
 /.coveralls.yml     export-ignore
+/.editorconfig      export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.travis.yml        export-ignore
-/phpcs.xml          export-ignore
+/phpcs.xml.dist     export-ignore
 /phpunit.xml.dist   export-ignore
diff --git a/phpcs.xml b/phpcs.xml.dist
similarity index 100%
rename from phpcs.xml
rename to phpcs.xml.dist