diff --git a/.editorconfig b/.editorconfig
index 6abd8d5..d1deb2c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,19 @@
-# Cross-editor coding style settings.
-# See http://editorconfig.org/ for details.
-
 root = true
 
 [*]
 charset = utf-8
-indent_style = space
-indent_size = 2
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[{.,}*.{js{,*},y{a,}ml}]
+indent_style = space
+indent_size = 2
+
+[*.{md,txt}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab