diff --git a/.editorconfig b/.editorconfig
index a751162..4df166d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +1,17 @@
+# http://editorconfig.org
 root = true
 
 [*]
-end_of_line = lf
-insert_final_newline = true
-
-[*.{js,py}]
-charset = utf-8
 indent_style = space
 indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+