diff --git a/.editorconfig b/.editorconfig
index 35447f7c9..08e375e0b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,24 +7,21 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace=true
 
 # Matches multiple files with brace expansion notation
 # Set default charset
 [{etc,include,lib,plugins,src,tests,tools,common}/**.{c,h,proto,cpp,hpp,h.in,hpp.in}]
-charset = utf-8
-indent_style = tab
-indent_size = 8
-trim_trailing_whitespace=true
+indent_style = space
+indent_size = 2
 
 [*.conf]
-charset = utf-8
 indent_style = tab
 indent_size = 8
 
 [*.nix]
-charset = utf-8
 indent_style = space
 indent_size = 2
-trim_trailing_whitespace=true