diff --git a/.editorconfig b/.editorconfig
index 4a036b995..9d5248e86 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,14 @@
+# editorconfig.org
+
 root = true
 
 [*]
 charset = utf-8
 end_of_line = lf
-insert_final_newline = true
-indent_style = space
 indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
+[*.md]
+trim_trailing_whitespace = false