diff --git a/.editorconfig b/.editorconfig
index e11d23203..4636c2f04 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,9 +23,9 @@ root = true
 charset = utf-8
 indent_style = space
 insert_final_newline = true
+max_line_length = 80
 spelling_language = en-US
 trim_trailing_whitespace = true
-max_line_length = 80
 
 [{BUILD,*.BUILD,*.bzl,*.bazel,.bazelrc,WORKSPACE}]
 indent_size = 4
@@ -38,7 +38,7 @@ indent_size = 4
 
 [{Makefile,makefile,*.mk}]
 indent_style = tab
-indent_size = 4
+tab_width = 8
 
 [{*.cc,*.h}]
 indent_size = 2