diff --git a/.editorconfig b/.editorconfig
index 1dc393c0e..c03aaac8d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,9 @@ tab_width   = 8
 indent_size = 2
 indent_style = space
 
+[**/Makefile*]
+indent_style = tab
+
 [Functions/VCS_Info/**/*]
 indent_size = 4
 indent_style = space
diff --git a/ChangeLog b/ChangeLog
index c7bad4e0e..a23e45761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-18  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* unposted: .editorconfig: Specify tabs for Makefiles.
+
 2020-03-17  Daniel Shahaf  <danielsh@apache.org>
 
 	* 45572: Completion/Linux/Command/_sshfs: Complete some more