diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..d4b0972edab
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# All files
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Python
+[*.py]
+indent_size = 4