diff --git a/.editorconfig b/.editorconfig
index c03aaac8d..ebc2a806b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,6 +10,7 @@ indent_style = space
 
 [**/Makefile*]
 indent_style = tab
+indent_size = 8
 
 [Functions/VCS_Info/**/*]
 indent_size = 4
diff --git a/ChangeLog b/ChangeLog
index a05703cbb..d9fa4a101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-12  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* unposted: .editorconfig: For Makefiles, make the indent size
+	equal to tab width.
+
 2020-07-11  dana  <dana@dana.is>
 
 	* Cedric Ware: 46152: Src/Modules/system.c, Test/V14system.ztst: