diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 0fea3fadca6..2a8b5dc2ca0 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Makefile.in ($(srcdir)/hash.h): Refer to GNU FTP site for
+	updated gperf.
+
 2000-10-05  Richard Henderson  <rth@cygnus.com>
 
 	* decl.c (finish_chill_function): Don't init can_reach_end.
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index 5b65f122bed..ecfcdbb9720 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -264,8 +264,7 @@ $(srcdir)/hash.h:
 	cat $(srcdir)/gperf gperf.tmp2 > gperf.tmp
 	gperf -L C -F ', 0, 0, 0' -D -E -S1 -p -j1 -i 1 -g -o -t -k'*' \
 	  gperf.tmp > $(srcdir)/hash.h || ( \
-	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
-	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	echo "Please update your 'gperf' from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2 ; \
 	exit 1 )
 	$(RM) gperf.tmp gperf.tmp2
 
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3bbe55eb80e..c392f6ba398 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Makefile.in (keyword.h): Refer to GNU FTP site for updated
+	gperf.
+
 2000-10-05  Tom Tromey  <tromey@cygnus.com>
 
 	* jvspec.c (jvgenmain_spec): Added `-fdollars-in-identifiers'.
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index 7cec2851e37..7db863cefb6 100644
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -244,8 +244,7 @@ lang.o: $(srcdir)/java-tree.def
 keyword.h: keyword.gperf
 	gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,$$ \
 	keyword.gperf > keyword.h || ( \
-	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
-	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	echo "Please update your 'gperf' from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2 ; \
 	exit 1 )
 
 jcf-path.o : jcf-path.c $(CONFIG_H) $(srcdir)/../system.h jcf.h