diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..47ff6e8918
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+; Top-most http://editorconfig.org/ file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+
+; 4-column tab indentation
+[*.cs]
+indent_style = tab
+indent_size = 4
+
+; 4-column tab indentation
+[*.yaml]
+indent_style = tab
+indent_size = 4
\ No newline at end of file