diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..8df24591e3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# See http://EditorConfig.org for more information
+
+# top-most EditorConfig file
+root = true
+
+# Every File
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false