diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..95dfec676
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# EditorConfig (is awesome): http://EditorConfig.org
+
+# * top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{bat,cmd,[Bb][Aa][Tt],[Cc][Mm][Dd]}]
+# DOS/Win requires BAT/CMD files to have CRLF EOLNs
+end_of_line = crlf
+
+[[Mm]akefile{,.*}]
+# TAB-style indentation
+indent_style = tab
+
+[*.{yml,[Yy][Mm][Ll]}]
+indent_size = 2