diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf93c45b7b8..d2d73ea437f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-23  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Makefile.in (USER_H): Remove proto.h.
+	* config.gcc (c*-convex-*): Set extra_headers=proto.h.
+
 2001-12-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* arc.c (arc_hard_regno_mode_ok): Const-ify.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 04bcf4e018d..304075d8ad4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -155,7 +155,7 @@ INSTALL_HEADERS_DIR = @build_install_headers_dir@
 # Header files that are made available under the same name
 # to programs compiled with GCC.
 USER_H = $(srcdir)/ginclude/stdarg.h $(srcdir)/ginclude/stddef.h \
-    $(srcdir)/ginclude/varargs.h $(srcdir)/ginclude/proto.h \
+    $(srcdir)/ginclude/varargs.h \
     $(srcdir)/ginclude/stdbool.h $(srcdir)/ginclude/iso646.h \
     $(EXTRA_HEADERS)
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 672c16e57dd..e3b43271b66 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -227,6 +227,7 @@ xscale-*-*)
 	;;
 c*-convex-*)
 	cpu_type=convex
+	extra_headers=proto.h
 	;;
 i[34567]86-*-*)
 	cpu_type=i386