diff --git a/.editorconfig b/.editorconfig
index c7ae182..dfa98b4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,27 @@
+# EditorConfig (is awesome): http://EditorConfig.org
+
+# * top-most EditorConfig file
 root = true
 
+# Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
-indent_size = 2
 end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.md]
-insert_final_newline = false
-trim_trailing_whitespace = false
+[*.{bat,cmd,[Bb][Aa][Tt],[Cc][Mm][Dd]}]
+# DOS/Win requires BAT/CMD files to have CRLF EOLNs
+end_of_line = crlf
 
-[Makefile]
+[[Mm]akefile{,.*}]
+# TAB-style indentation
 indent_style = tab
+
+[*.{markdown,[Mm][Aa][Rr][Kk][Dd][Oo][Ww][Nn],[Mm][Kk][Dd][Oo][Ww][Nn],[Mm][Kk][Dd],[Mm][Dd][Oo][Ww][Nn],[Mm][Dd]}]
+indent_size = 2
+
+[*.{yml,[Yy][Mm][Ll]}]
+indent_size = 2