diff --git a/.editorconfig b/.editorconfig
index 5345e9e5d..f431331b9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,9 @@
+root = true
+
 [*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=true
-indent_style=space
-indent_size=4
+charset = utf-8
+
+[*.java]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true