diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..26ba2b04430
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+; http://editorconfig.org/
+
+root = true
+
+[*]
+charset                  = UTF-8
+end_of_line              = LF
+indent_size              = 4
+indent_style             = tab
+insert_final_newline     = true
+tab_width                = 4
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_size              = 2
+indent_style             = space