diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 750e2506b36a..6a82b112b9f3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-30  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* acinclude.m4: Update URL on egcs.cygnus.com to point to
+	gcc.gnu.org.
+	* aclocal.m4, configure: Regenerate.
+	* src/gen-num-limits.cc, include/bits/c++config,
+	include/bits/stl_config.h: Remove EGCS references.
+
 2000-10-29  Mark Mitchell  <mark@codesourcery.com>
 
 	* mkcheck.in (test_file): Use -rpath, rather than --rpath, when
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 1c8ae92a6c9e..cc4a54967dca 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1128,7 +1128,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT, [
       // Check for buggy __complex__ that causes ICE in most versions of egcs
       // and gcc-2.95.x on certain platforms (eg., x86-win32).
       //
-      // See http://egcs.cygnus.com/ml/gcc-bugs/1999-07/msg00845.html for
+      // See http://gcc.gnu.org/ml/gcc-bugs/1999-07n/msg00845.html for
       // more info on the bug itself.
       //
       struct
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index d2f4a14fd84c..9a614775393e 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1140,7 +1140,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT, [
       // Check for buggy __complex__ that causes ICE in most versions of egcs
       // and gcc-2.95.x on certain platforms (eg., x86-win32).
       //
-      // See http://egcs.cygnus.com/ml/gcc-bugs/1999-07/msg00845.html for
+      // See http://gcc.gnu.org/ml/gcc-bugs/1999-07n/msg00845.html for
       // more info on the bug itself.
       //
       struct
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 70c351d4c8ae..ea766d6df6ef 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17270,7 +17270,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
       // Check for buggy __complex__ that causes ICE in most versions of egcs
       // and gcc-2.95.x on certain platforms (eg., x86-win32).
       //
-      // See http://egcs.cygnus.com/ml/gcc-bugs/1999-07/msg00845.html for
+      // See http://gcc.gnu.org/ml/gcc-bugs/1999-07n/msg00845.html for
       // more info on the bug itself.
       //
       struct
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index e8d7d6962c26..860cc5674c4d 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -48,7 +48,7 @@
 // string and exception.
 # define _GLIBCPP_USE_EXCEPTIONS 1 
 
-// This is necessary until Egcs supports separate template
+// This is necessary until GCC supports separate template
 // compilation.  
 #define _GLIBCPP_NO_TEMPLATE_EXPORT 1
 
diff --git a/libstdc++-v3/include/bits/stl_config.h b/libstdc++-v3/include/bits/stl_config.h
index 8a6e15c25de5..9183a998fb10 100644
--- a/libstdc++-v3/include/bits/stl_config.h
+++ b/libstdc++-v3/include/bits/stl_config.h
@@ -328,7 +328,7 @@
 #   endif
 # endif
 
-// Mingw32, egcs compiler using the Microsoft C runtime
+// Mingw32, GCC compiler using the Microsoft C runtime
 # if defined(__MINGW32__)
 #   define __STL_NO_DRAND48
 #   ifdef _MT
@@ -336,7 +336,7 @@
 #   endif
 # endif
 
-// Cygwin32, egcs compiler on MS Windows
+// Cygwin32, GCC compiler on MS Windows
 # if defined(__CYGWIN__)
 #   define __STL_NO_DRAND48
 # endif
diff --git a/libstdc++-v3/src/gen-num-limits.cc b/libstdc++-v3/src/gen-num-limits.cc
index 0756818ef12e..10c5336b7d54 100644
--- a/libstdc++-v3/src/gen-num-limits.cc
+++ b/libstdc++-v3/src/gen-num-limits.cc
@@ -26,7 +26,7 @@
 // the GNU General Public License.
 
 //
-// Written by Gabriel Dos Reis <gdr@egcs.cygnus.com>
+// Written by Gabriel Dos Reis <gdr@gcc.gnu.org>
 // 
 // Note: This program outputs speciliazations of ISO C++ class template
 // numeric_limits<> as described in 18.2.1.