diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..75ba9dacb55
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+
+[*.yml]
+indent_style = space
+indent_size = 2