diff --git a/.editorconfig b/.editorconfig
index de589d0b..0c412a3d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,8 +7,10 @@ indent_size = 4
 tab_width = 4
 charset = utf-8
 insert_final_newline = true
+trim_trailing_whitespace = true
 max_line_length = 100
 
 [Makefile*]
 indent_style = tab
+tab_width = 8
 indent_size = 8