diff --git a/.editorconfig b/.editorconfig
index b1fb74ba1a9..2183af64b5e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -43,9 +43,10 @@ charset = utf-8
 [*.sh]
 indent_size = 4
 # Makefile's
-[*.am]
+[{*.am,*.mk,Makefile.inc}]
 trim_trailing_whitespace = false
 indent_style = tab
+indent_size = 8
 [*.rst]
 max_line_length = 80
 indent_size = 3