diff --git a/.editorconfig b/.editorconfig
index 153cf3ef5b..d769b46a4b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,8 +3,17 @@ root = true
 
 ; Unix-style newlines
 [*]
+charset = utf-8
 end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.php]
+[*.{php,html,twig}]
 indent_style = space
 indent_size = 4
+
+[*.md]
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+max_line_length = 0