diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3dc569c0596..24e088fcbb6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR bootstrap/7817
+	* Make-lang.in: Copy gcc.1 to g++.1 rather than using .so.
+
 2004-01-10  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	DR 337
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 1947311a9a2..5c8bffc9d50 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -154,9 +154,10 @@ c++.install-common: installdirs
 	  fi ; \
 	fi
 
-$(docobjdir)/g++.1:
-	-rm -f $@
-	-echo ".so man1/$(GCC_INSTALL_NAME).1" > $@
+# We can't use links because not everyone supports them, and we can't use
+# .so because Irix 6.5 doesn't support them.  So just copy the manpage.
+$(docobjdir)/g++.1: $(docobjdir)/gcc.1
+	cp $(docobjdir)/gcc.1 $(docobjdir)/g++.1
 
 c++.install-man: installdirs $(docobjdir)/g++.1
 	-if [ -f cc1plus$(exeext) ] ; then \