diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..588ac8a2
--- /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/.gitignore b/.gitignore
index b3bc02af..54e9a5bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,9 @@ config.py
 auto_config.py
 .DS_Store
 .idea/
-.vscode/
+.vscode/*
 # IDE resources
-.vscode
+!.vscode/extensions.json
 .idea
 Gemfile.lock
 .ignore/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..f47a55ac
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "editorconfig.editorconfig"
+    ]
+}