diff --git a/.editorconfig b/.editorconfig
index 677e36e295e22dc4b69d04902912abdfca604f7e..743272b9b8202e867fb3053d3a2813467c8027a3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,5 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
+# See: http://editorconfig.org
 root = true
 
 [*]
@@ -7,3 +9,9 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab