diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5c424d62689..c26d2789fdb 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-18  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* doc/Makefile.am (MOSTLYCLEANFILES): Clean all man pages,
+	cxxfilt.man and binutils.info.
+	(MAINTAINERCLEANFILES): Remove.
+	* doc/Makefile.in: Re-generate.
+
 2019-09-18  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* doc/Makefile.am: Remove references to binutils_TEXINFOS.
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 9eabaa7a611..c58fa689f92 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -162,7 +162,7 @@ cxxfilt.man:	$(binutils_TEXI)
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $(DEMANGLER_NAME).pod
 
-MOSTLYCLEANFILES     = $(DEMANGLER_NAME).1
+MOSTLYCLEANFILES     = $(man_MANS) binutils.info cxxfilt.man
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
 	if test -f cxxfilt.man; then \
@@ -174,8 +174,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile
 	    -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \
 		> $(DEMANGLER_NAME).1
 
-MAINTAINERCLEANFILES = binutils.info
-
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 73600fb2efb..3023c7bdd30 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -426,8 +426,7 @@ AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 		    -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
-MOSTLYCLEANFILES = $(DEMANGLER_NAME).1
-MAINTAINERCLEANFILES = binutils.info
+MOSTLYCLEANFILES = $(man_MANS) binutils.info cxxfilt.man
 all: all-am
 
 .SUFFIXES:
@@ -721,7 +720,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am