diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 785ac1b0686..4c8e307f1ff 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
+        
+	* root.texi: Update e-mail addresses to gcc.gnu.org.
+	* g77spec.c (lang_specific_driver): Updated URL with bug reporting 
+	instructions to gcc.gnu.org.  Removed e-mail address.
+
 Sat Jul 17 11:28:43 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* root.texi, g77install.texi: Switchover to GCC terminology.
diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 4bf318d4399..32b3c3ee013 100644
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -427,8 +427,8 @@ code-generation methodology, and so on.\n\
 For more information on g77 and gcc, type the commands `info -f g77'\n\
 and `info -f gcc' to read the Info documentation.\n\
 \n\
-Report bugs to <egcs-bugs@egcs.cygnus.com>.\n\
-See <URL:http://egcs.cygnus.com/faq.html#bugreport> for details.\n");
+For bug reporting instructions, please see:\n\
+<URL:http://gcc.gnu.org/faq.html#bugreport>.\n");
 	  exit (0);
 	  break;
 #endif
diff --git a/gcc/f/root.texi b/gcc/f/root.texi
index abc0058faf8..4ade3ccea6c 100644
--- a/gcc/f/root.texi
+++ b/gcc/f/root.texi
@@ -16,8 +16,8 @@
 @c FSF-G77 indicates this is the FSF (0.5.23 or earlier) version of g77.
 @clear FSF-G77
 
-@set email-general egcs@@egcs.cygnus.com
-@set email-bugs egcs-bugs@@egcs.cygnus.com
+@set email-general gcc@@gcc.gnu.org
+@set email-bugs gcc-bugs@@gcc.gnu.org
 @set path-g77 egcs/gcc/f
 @set path-libf2c egcs/libf2c