diff --git a/editorconfig b/editorconfig
index 218ed167..48a57f15 100644
--- a/editorconfig
+++ b/editorconfig
@@ -4,10 +4,12 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 2
+
+[*.{php,css,scss,sass,js,json,jsx,tmpl,html,haml,twig,yml,svg}]
 trim_trailing_whitespace = true
-insert_final_newline = true
 
-[*.{md,rst,txt,csv}]
+[*.{md,markdown,rst,txt,csv,snip,mail}]
 trim_trailing_whitespace = false