diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..0b45e8b3592
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+root = true
+
+[*]
+charset = utf-8
+
+indent_style = space
+indent_size = 2
+
+trim_trailing_whitespace = true
+
+max_line_length = 80
+end_of_line = lf
+insert_final_newline = true
+
+[*patch]
+# Trailing spaces are significant in patch files
+trim_trailing_whitespace = false