diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index ad1c3f5aeb638f0bbd5895706a09d3840cc08d63..a149ab13d326a25aabbca0fc8939a7d511506eba 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -17,9 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* For the sake of libgcc2.c, indicate target supports atexit.  */
 #define HAVE_ATEXIT
diff --git a/gcc/dwarf2.h b/gcc/dwarf2.h
index db19904802c017da9735b93c10c9a774d1c99dc3..ddbe1b823bba5880dcb31da8e5b57f88c274b065 100644
--- a/gcc/dwarf2.h
+++ b/gcc/dwarf2.h
@@ -4,21 +4,22 @@
    Contributed by Gary Funck (gary@intrepid.com).  Derived from the
    DWARF 1 implementation written by Ron Guilmette (rfg@monkeys.com).
 
-   This file is part of GNU CC.
-
-   GNU CC is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU CC is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU CC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file is derived from the DWARF specification (a public document)
    Revision 2.0.0 (July 27, 1993) developed by the UNIX International
diff --git a/gcc/dyn-string.c b/gcc/dyn-string.c
index 4f8eb160765cb55a4ea2182f1d5cc4e15ac94b2e..02ee8373c4383184593f2bc45a956e6bf2e09fde 100644
--- a/gcc/dyn-string.c
+++ b/gcc/dyn-string.c
@@ -2,21 +2,21 @@
    Copyright (C) 1998 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
-   This file is part of GNU CC.
+This file is part of GNU CC.
    
-   GNU CC is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GNU CC is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU CC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+GNU CC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to the Free
+Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "config.h"
 #include "system.h"
diff --git a/gcc/dyn-string.h b/gcc/dyn-string.h
index ed8071f8b086be47868ce054a030d364cf12fdca..bb2d831d764a618e9423227069f15cfa353e433e 100644
--- a/gcc/dyn-string.h
+++ b/gcc/dyn-string.h
@@ -2,21 +2,21 @@
    Copyright (C) 1998 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
-   This file is part of GNU CC.
+This file is part of GNU CC.
    
-   GNU CC is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+GNU CC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
 
-   GNU CC is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+GNU CC is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU CC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to the Free
+Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 typedef struct dyn_string
 {
diff --git a/gcc/hash.c b/gcc/hash.c
index 7efd65291904f108047696a0dcdf6bca86ead45a..f333c6c4d706120add2f3b5cec36b5262b29dec9 100644
--- a/gcc/hash.c
+++ b/gcc/hash.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
diff --git a/gcc/hash.h b/gcc/hash.h
index 7109c229148b369e16f032e07ce4628a408478f3..ac3b1ede57015e588cc0d3c2fcdd4ec94010893a 100644
--- a/gcc/hash.h
+++ b/gcc/hash.h
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef IN_GCC
 #include <ansidecl.h>
diff --git a/libio/config.shared b/libio/config.shared
index ff509959a7e02abe09a74cfe4a909cafb69fcce6..ea78a1e33a3e141bc3c3b6accd817b5237be0154 100644
--- a/libio/config.shared
+++ b/libio/config.shared
@@ -13,7 +13,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU CC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.  */
 
 # File descriptor usage:
 # 1: All macros which need to be re-definable by any target fragments
diff --git a/libio/tests/Makefile.in b/libio/tests/Makefile.in
index f93b30046bb2048f31da6d38ecff069d3eb4556c..b70639a68096ac9f1c39eca3a0a40a6c40de61f6 100644
--- a/libio/tests/Makefile.in
+++ b/libio/tests/Makefile.in
@@ -13,7 +13,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU CC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.  */
 
 srcdir = .
 
diff --git a/libio/testsuite/Makefile.in b/libio/testsuite/Makefile.in
index 76081fb2d339d7b7aa74fd8fddc670b9923f4b84..d1795d00df60d997f613dc8ce00bbf5670f62ca1 100644
--- a/libio/testsuite/Makefile.in
+++ b/libio/testsuite/Makefile.in
@@ -13,7 +13,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU CC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.  */
 
 srcdir = libio.tests
 
diff --git a/libstdc++/testsuite/Makefile.in b/libstdc++/testsuite/Makefile.in
index 3a969b0dd6e26d5b2a5f8a3e04352936972bd348..7c85678e1fe3851b5d72ac87c9175d27267d6819 100644
--- a/libstdc++/testsuite/Makefile.in
+++ b/libstdc++/testsuite/Makefile.in
@@ -13,7 +13,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU CC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.  */
 
 srcdir = libstdc++.tests