diff --git a/.editorconfig b/.editorconfig
index a42588d1a6..22e9891c4b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@ root = true
 indent_size = 2
 trim_trailing_whitespace = true
 
-[*.{c,cpp,h}]
+[*.{c,cpp,h,java}]
 indent_style = space
 insert_final_newline = true
 max_line_length = 100
@@ -20,10 +20,6 @@ indent_size = 4
 indent_style = space
 insert_final_newline = false
 
-[*.java]
-indent_style = tab
-insert_final_newline = true
-
 [*.xml]
 indent_size = 4
 indent_style = space