diff --git a/.gitignore b/.gitignore
index a7055b8..36899db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -215,6 +215,8 @@
 /libcharset/build-aux/config.guess
 /libcharset/build-aux/config.sub
 
+# ---------- "make -f Makefile.devel totally-clean" gets you here ----------
+
 # Files generated by the autotools:
 # Built by Makefile.devel.
 /aclocal.m4
diff --git a/ChangeLog b/ChangeLog
index 011cd87..141ac02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2016-12-29  Bruno Haible  <bruno@clisp.org>
+
+	Make Makefile.devel consistent with .gitignore.
+	* Makefile.devel (srclib/Makefile.in): Depend on aclocal.m4.
+	(totally-clean): Remove also aclocal.m4.
+
 2016-12-25  Bruno Haible  <bruno@clisp.org>
 
 	Tweak autogen.sh.
-	* autogen.sh: Emit a "done" diagnostic when autogen.sh completed successfully.
+	* autogen.sh: Emit a "done" diagnostic when autogen.sh completed
+	successfully.
 
 2016-12-25  Bruno Haible  <bruno@clisp.org>
 
diff --git a/Makefile.devel b/Makefile.devel
index 3c9065b..2ed8e63 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -71,7 +71,7 @@
 	    --import $(GNULIB_MODULES); \
 	fi
 
-srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib
+srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib aclocal.m4
 	if test -n "$$GNULIB_TOOL"; then \
 	  $$GNULIB_TOOL --copy-file build-aux/ar-lib; \
 	  $$GNULIB_TOOL --copy-file build-aux/compile; \
@@ -226,7 +226,7 @@
 
 totally-clean : force
 	rm -f srclib/Makefile.in
-	rm -f $(CONFIGURES) config.h.in include/iconv.h.build.in
+	rm -f aclocal.m4 $(CONFIGURES) config.h.in include/iconv.h.build.in
 	rm -f lib/aliases.gperf lib/aliases_sysaix.gperf lib/aliases_syshpux.gperf lib/aliases_sysosf1.gperf lib/aliases_syssolaris.gperf
 	rm -f lib/aliases.h lib/aliases_sysaix.h lib/aliases_syshpux.h lib/aliases_sysosf1.h lib/aliases_syssolaris.h
 	rm -f lib/aliases_aix.h lib/aliases_aix_sysaix.h