diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8039cc87f0..15f9067418 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-19  H.J. Lu  <hjl@gnu.org>
+
+	* doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and
+	$(srcdir)/cxxfilt.man.
+	* doc/Makefile.in: Rebuild.
+
 2001-09-19  Alan Modra  <amodra@bigpond.net.au>
 
 	* objcopy.c (copy_main): Correct rename-section string parsing.
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index b4a0d2aab6..8fc8c087ec 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -146,8 +146,13 @@ DISTCLEANFILES       = config.texi
 MOSTLYCLEANFILES     = $(DEMANGLER_NAME).1
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
+	if test -f cxxfilt.man; then \
+	  man=cxxfilt.man; \
+	else \
+	  man=$(srcdir)/cxxfilt.man; \
+	fi; \
 	sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
-	    -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \
+	    -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \
 		> $(DEMANGLER_NAME).1
 
 # Maintenance
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 6a62bb34b0..51fda7e7ec 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -129,7 +129,9 @@ MANCONF = -Dman
 
 TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl
 
-POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
+POD2MAN = pod2man --center="GNU Development Tools" \
+	 --release="binutils-$(VERSION)" --section=1
+
 
 # List of man pages generated from binutils.texi
 man_MANS = \
@@ -536,8 +538,13 @@ cxxfilt.man:	$(binutils_TEXI)
 	rm -f $(DEMANGLER_NAME).pod
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
+	if test -f cxxfilt.man; then \
+	  man=cxxfilt.man; \
+	else \
+	  man=$(srcdir)/cxxfilt.man; \
+	fi; \
 	sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
-	    -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \
+	    -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \
 		> $(DEMANGLER_NAME).1
 
 # Maintenance