diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..6b97bf878d2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.go]
+indent_style = tab
+indent_size = 4
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.yml,*.tmpl]
+indent_style = space
+indent_size = 2