diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..9b9ea1fd7
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# This file is the top-most EditorConfig file
+root = true
+
+# All Files
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+#########################
+# File Extension Settings
+#########################
+
+# YAML Files
+[*.{yml,yaml,log.config.j2,yaml.j2}]
+indent_style = space
+indent_size = 2
+
+# Markdown Files
+[*.md]
+trim_trailing_whitespace = false