diff --git a/.editorconfig b/.editorconfig
index fb4bac6a..18d9ee17 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,3 +19,9 @@ indent_size = 2
 [*.py]
 indent_style = space
 indent_size = 4
+
+[{Makefile,*.mak}]
+indent_style = tab
+
+[COMMIT_EDITMSG]
+max_line_length = 72