diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..9007f6ba
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 6da920e3..15891ca2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,3 +5,4 @@
 /phpunit.xml.dist export-ignore
 /_config.yml export-ignore
 /UPGRADE.md
+/.editorconfig export-ignore