diff --git a/.editorconfig b/.editorconfig
index f4ceddebf012..60d636c2e98e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,10 +6,17 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
-charset = utf
+charset = utf-8
 end_of_line = lf
 indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 max_line_length = 80
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{bazel,bzl,py}]
+indent_size = 4
+max_line_length = 79