diff --git a/.editorconfig b/.editorconfig
index 98fec8b17d..7f22176942 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,17 +1,22 @@
 # EditorConfig for Spring Security
 # see https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md#mind-the-whitespace
 
-# top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
-insert_final_newline = true
-charset = latin1
-
-# 4 tabs indentation
-indent_style = tab
-tab_width = 4
-
 trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[*.java]
+indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8