diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..588ac8a21066
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{sh,json}]
+indent_size = 4
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 71e56ca600f9..e889104925ce 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
     "recommendations": [
+        "editorconfig.editorconfig",
         "ms-vscode-remote.remote-containers",
         "rebornix.ruby"
     ]