diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 4bd53167e79ff7b6f082ce02e657e9b857c7316d..8be90f0248773f947519af518d902a32e519a8e4 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* All files: Update FSF address.
+
 2005-08-15  Ulrich Weigand  <weigand@informatik.uni-erlangen.de>
 
 	* mf-hooks3.c (main_seen_p): Remove.
diff --git a/libmudflap/mf-heuristics.c b/libmudflap/mf-heuristics.c
index 9118bc6e61b8557b2d993a19ee9a862944276733..4a1a26cb3988c8d3398dc64a1cb6f94ffb1d20ec 100644
--- a/libmudflap/mf-heuristics.c
+++ b/libmudflap/mf-heuristics.c
@@ -26,8 +26,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "config.h"
diff --git a/libmudflap/mf-hooks1.c b/libmudflap/mf-hooks1.c
index 9460e443498a911aaf59366d6754322726975edd..0700d9a9335fc3f9c192b7c721d6a715ffe95a50 100644
--- a/libmudflap/mf-hooks1.c
+++ b/libmudflap/mf-hooks1.c
@@ -26,8 +26,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "config.h"
diff --git a/libmudflap/mf-hooks2.c b/libmudflap/mf-hooks2.c
index 87cb270b8fd59411ad2c5c6f94f6497a69043630..2b961b47a137743bfa441d0625723a1ff0c283ee 100644
--- a/libmudflap/mf-hooks2.c
+++ b/libmudflap/mf-hooks2.c
@@ -26,8 +26,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "config.h"
diff --git a/libmudflap/mf-hooks3.c b/libmudflap/mf-hooks3.c
index e32f13a58efae5c1a6368b74f063358ab20a6d14..dec4cd63b83da62f3c7d9f3df2970bfd9df5a907 100644
--- a/libmudflap/mf-hooks3.c
+++ b/libmudflap/mf-hooks3.c
@@ -26,8 +26,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "config.h"
diff --git a/libmudflap/mf-impl.h b/libmudflap/mf-impl.h
index 53c25b392cab7536bb9c508d38c6132acee047d7..6b44edaba5c30ebf5ee2abf7a550a6d3eef0b2d0 100644
--- a/libmudflap/mf-impl.h
+++ b/libmudflap/mf-impl.h
@@ -27,8 +27,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #ifndef __MF_IMPL_H
 #define __MF_IMPL_H
diff --git a/libmudflap/mf-runtime.c b/libmudflap/mf-runtime.c
index e6901650975735fa257fb62726070ab37d5d96b5..72d1a575958dd0717fc3208ce1efdd2e30f965fb 100644
--- a/libmudflap/mf-runtime.c
+++ b/libmudflap/mf-runtime.c
@@ -28,8 +28,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #include "config.h"
 
diff --git a/libmudflap/mf-runtime.h b/libmudflap/mf-runtime.h
index 0c2eac970b995cb42b5a7ab2cbdf06a703887bb7..68c7b54192f8c2a71a7a504c7c3293dd90915809 100644
--- a/libmudflap/mf-runtime.h
+++ b/libmudflap/mf-runtime.h
@@ -27,8 +27,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* Public libmudflap declarations -*- C -*- */
 
diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp
index 4b80716ebbfd6d4aea52e6a4bc758d9b990c052a..634f1cb28ad5c1643054474af4b555e0a4f81365 100644
--- a/libmudflap/testsuite/lib/libmudflap.exp
+++ b/libmudflap/testsuite/lib/libmudflap.exp
@@ -12,7 +12,7 @@
 # 
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
 
 # Define libmudflap callbacks for dg.exp.
 # This file is a copy of libstdc++-v3's dejagnu driver, with minor changes.
diff --git a/libmudflap/testsuite/lib/mfdg.exp b/libmudflap/testsuite/lib/mfdg.exp
index 25473d612698e691ac53df99fa3c7d55e362925b..7bcd44a94c11c1e27c4560d876e3fd2421806ea9 100644
--- a/libmudflap/testsuite/lib/mfdg.exp
+++ b/libmudflap/testsuite/lib/mfdg.exp
@@ -13,7 +13,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
 # This is a modified excerpt of dejagnu/lib/dg.exp.
diff --git a/libmudflap/testsuite/libmudflap.c/pass-stratcliff.c b/libmudflap/testsuite/libmudflap.c/pass-stratcliff.c
index 894f10ffa96fd54e08bdb011231e7355a2bd7d4d..baaf8a9f3536138867b0ff2cdd5063ca758af2b4 100644
--- a/libmudflap/testsuite/libmudflap.c/pass-stratcliff.c
+++ b/libmudflap/testsuite/libmudflap.c/pass-stratcliff.c
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
 
 #define _GNU_SOURCE 1
 #define __USE_GNU
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 9f623b8208171ef6d589479c4171d53addedbe7c..0161254ac5a8e2dad85d090fd03140df0a3a18a1 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* All files: Update FSF address.
+
 2005-08-13  Marcin Koziej  <creep@desk.pl>
             Andrew Pinski  <pinskia@physics.uc.edu>
 
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index b9c216bc80e6cb1e9d306a4861a9986c2c70b26d..6704be1010c841d78892742f92ebf5aacfd79b1f 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -16,8 +16,8 @@
 
 #You should have received a copy of the GNU General Public License
 #along with GCC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 59 Temple Place - Suite 330,
-#Boston, MA 02111-1307, USA.  */
+#the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+#Boston, MA 02110-1301, USA.  */
 
 #This was cribbed from the libchill, libiberty and libstdc++
 #Makefile.in files.  Some of this stuff may be unnecessary and
diff --git a/libobjc/NXConstStr.m b/libobjc/NXConstStr.m
index 4f75bdb99de2a87683bcee33f983af9777003deb..9afe30ae58af2104bd1becf519f7915514f02dc0 100644
--- a/libobjc/NXConstStr.m
+++ b/libobjc/NXConstStr.m
@@ -16,8 +16,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
  
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/Object.m b/libobjc/Object.m
index 7425ff33877a034b4b2ba116e79a2c530e84e4b8..3d7d2084b32c51c47d89bcda8eb29c189482bdea 100644
--- a/libobjc/Object.m
+++ b/libobjc/Object.m
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/Protocol.m b/libobjc/Protocol.m
index 689d97e73de71d7f0ae505dae627de1c95b727d9..645e99114c56b2995536b49abdfc6a833c816808 100644
--- a/libobjc/Protocol.m
+++ b/libobjc/Protocol.m
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
  
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4
index 1c772b8f88576b51c38e2878b06fb59ac6bd3b1a..f171289bdd5af7a966d105643364e69cabbbf539 100644
--- a/libobjc/aclocal.m4
+++ b/libobjc/aclocal.m4
@@ -27,8 +27,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -91,8 +91,8 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # serial 6
 
@@ -136,8 +136,8 @@ fi])])
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # serial 3
 
@@ -178,8 +178,8 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 AC_DEFUN([AM_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl
diff --git a/libobjc/archive.c b/libobjc/archive.c
index 3bfd975a18a124fe908d93bbb52a47041d02f6b3..eeaf29c62f34c70ec3fa2694763835d435760f8c 100644
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/class.c b/libobjc/class.c
index 2140652ff1e4b7065fad04e9f46934d152ba7ec7..4374852989ce801491486e7d9639181bcd85a2bf 100644
--- a/libobjc/class.c
+++ b/libobjc/class.c
@@ -19,7 +19,7 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/configure.ac b/libobjc/configure.ac
index bf5fe7b903b0ae8aed5bd0facf689458a023499d..caf2f8de0f60d9675fd93bb6cffdcc74553b8b47 100644
--- a/libobjc/configure.ac
+++ b/libobjc/configure.ac
@@ -17,8 +17,8 @@
 #
 #You should have received a copy of the GNU General Public License
 #along with GCC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-#02111-1307, USA.
+#the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+#02110-1301, USA.
 
 AC_PREREQ(2.59)
 AC_INIT(package-unused, version-unused,, libobjc)
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index 95cf65277364f065116aa37fffe7467e5ae5dfb5..efdc2f0a1614b6d66d882bd177f78cf87a86453f 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -18,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/exception.c b/libobjc/exception.c
index e34f34b4342c73265197ca2517c5f76bf9f40623..e1de2ae5af19bc8fb6c69f7237ce2525daae56dd 100644
--- a/libobjc/exception.c
+++ b/libobjc/exception.c
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/gc.c b/libobjc/gc.c
index a4766894ab39aa79871247fcfbf3e1597fe3c5e8..9bb11fc478f5c3b3d5afbd9ec3aa910b00c1b01f 100644
--- a/libobjc/gc.c
+++ b/libobjc/gc.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/hash.c b/libobjc/hash.c
index a32279cd7a70ab46569e7c4482e6bf64ee1b07be..969bd45856604ea2ce2137b0a8715396a7500364 100644
--- a/libobjc/hash.c
+++ b/libobjc/hash.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/hash_compat.c b/libobjc/hash_compat.c
index 905b9e43c679e497ade1f550d8782fd337461f52..b04eee6d43bbeae0d079e07e7ccd2e5846bc9660 100644
--- a/libobjc/hash_compat.c
+++ b/libobjc/hash_compat.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/init.c b/libobjc/init.c
index 40d9016e239726489180bd6398665c8ad7d6edbd..fc3d7ff3c0cd3feb0a9a992badb9dceb58bcc7a4 100644
--- a/libobjc/init.c
+++ b/libobjc/init.c
@@ -16,7 +16,7 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/libobjc.def b/libobjc/libobjc.def
index bd50959cf07ca122b28c33d3c07242795b9cb7a7..a80fb615589693d5e89d152dfdd9bb7e72362db8 100644
--- a/libobjc/libobjc.def
+++ b/libobjc/libobjc.def
@@ -15,8 +15,8 @@
 ;
 ;  You should have received a copy of the GNU General Public License along with
 ;  GCC; see the file COPYING.  If not, write to the Free Software
-;  Foundation, 59 Temple Place - Suite 330,
-;  Boston, MA 02111-1307, USA.
+;  Foundation, 51 Franklin Street, Fifth Floor,
+;  Boston, MA 02110-1301, USA.
 
 LIBRARY libobjc
 EXPORTS
diff --git a/libobjc/libobjc_entry.c b/libobjc/libobjc_entry.c
index 22ff959dca9729607bd149df139b3d77aac0f4e3..205b0eda3b02c18b77dba87c55ea4d7f50bbe4a7 100644
--- a/libobjc/libobjc_entry.c
+++ b/libobjc/libobjc_entry.c
@@ -16,8 +16,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/linking.m b/libobjc/linking.m
index a54ae012356ce0cc1130ea667f911171a0b23164..8c8a0a968b7635e1992c19a07a2b16ece93ad214 100644
--- a/libobjc/linking.m
+++ b/libobjc/linking.m
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/makefile.dos b/libobjc/makefile.dos
index 63903cb660e7086a3875d8001b29ce3d26f82285..c7544a16476c4c0c50daab5ed7757f91e1bfe870 100644
--- a/libobjc/makefile.dos
+++ b/libobjc/makefile.dos
@@ -14,8 +14,8 @@
 #
 #  You should have received a copy of the GNU General Public License along with
 #  GCC; see the file COPYING.  If not, write to the Free Software
-#  Foundation, 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA. 
+#  Foundation, 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA. 
 
 # This Makefile is configured for GnuMAKE
 
diff --git a/libobjc/misc.c b/libobjc/misc.c
index fd9561f45448292bb020db48ef90dad4164aa915..972cff15290a90923e2582f31dc9ae054bfe237c 100644
--- a/libobjc/misc.c
+++ b/libobjc/misc.c
@@ -17,8 +17,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/nil_method.c b/libobjc/nil_method.c
index e1802aa107d52c272e22a88f660e7cd17fd605b7..268f0e330da0e97b52368b2d6a8ce7aa8dea73dd 100644
--- a/libobjc/nil_method.c
+++ b/libobjc/nil_method.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/objc/NXConstStr.h b/libobjc/objc/NXConstStr.h
index b0f6ea504cd25c46b05f338c30720711d2ca5d87..3f408d3a207c3f79c67a10d7c5fd8c8f81f01d09 100644
--- a/libobjc/objc/NXConstStr.h
+++ b/libobjc/objc/NXConstStr.h
@@ -16,8 +16,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
  
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/Object.h b/libobjc/objc/Object.h
index 21552cab47ffe6f8f18dcfd87861fb3fd103f748..7b67f46615c62d9a4cee5800af278965461a9e56 100644
--- a/libobjc/objc/Object.h
+++ b/libobjc/objc/Object.h
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/objc/Protocol.h b/libobjc/objc/Protocol.h
index fa65a2e4cf9b484578d1793589c470df6159229f..fe0f28a8eb42915f0ce25fec721f8384033303db 100644
--- a/libobjc/objc/Protocol.h
+++ b/libobjc/objc/Protocol.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/encoding.h b/libobjc/objc/encoding.h
index f09b549f12c951b0ba1fb1d3921f44a03be10f44..c432ee93bd3c337cf775528cc53a12436c3fa765 100644
--- a/libobjc/objc/encoding.h
+++ b/libobjc/objc/encoding.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/hash.h b/libobjc/objc/hash.h
index d9f3aee86bbcbdc0fdeba0f20b3d43ef58e8616a..2260fad56928ff71a17944cc51e3da67139fa416 100644
--- a/libobjc/objc/hash.h
+++ b/libobjc/objc/hash.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h
index 9011ab5d2b394344465cd90cb099da7c5f63e68d..f647fbdbd9e3b052bf011dbe641ffcda8f7e82cb 100644
--- a/libobjc/objc/objc-api.h
+++ b/libobjc/objc/objc-api.h
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/objc/objc-decls.h b/libobjc/objc/objc-decls.h
index 6d64c3bb52b1b810297e8bc746f227123c28cb2a..52938a2381c8e68dd85c389618f9a2244b7e2f02 100644
--- a/libobjc/objc/objc-decls.h
+++ b/libobjc/objc/objc-decls.h
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/objc/objc-list.h b/libobjc/objc/objc-list.h
index 19f0b85a767f8c21cde84f051884efda59573074..051e1c2c132af0a9060660c21031dcf2e6a761be 100644
--- a/libobjc/objc/objc-list.h
+++ b/libobjc/objc/objc-list.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/objc/objc.h b/libobjc/objc/objc.h
index da20d84bf40f1b252a3a44104490c395ad3f23a6..ee7612c9754c9c9c4fb46c8ce89877d3350a573f 100644
--- a/libobjc/objc/objc.h
+++ b/libobjc/objc/objc.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/runtime.h b/libobjc/objc/runtime.h
index f4f3746c0bbb646a0469f69f7f1cbd464c3098ae..3582d1d91c0cf0e2ba00cf85167a246625aaf662 100644
--- a/libobjc/objc/runtime.h
+++ b/libobjc/objc/runtime.h
@@ -15,7 +15,7 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/objc/sarray.h b/libobjc/objc/sarray.h
index f19407baa221ce8d2ebc2dcedeb0887b21caa976..fe66b2e9a73cf003826ad2ed4cd9b5f6d0f3cbe9 100644
--- a/libobjc/objc/sarray.h
+++ b/libobjc/objc/sarray.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/thr.h b/libobjc/objc/thr.h
index d3d791a6d8fdd7d8a11be2edffd7e1beb38328ba..c13992688901435f47d8cccfc108cf97cdda64b5 100644
--- a/libobjc/objc/thr.h
+++ b/libobjc/objc/thr.h
@@ -25,8 +25,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/objc/typedstream.h b/libobjc/objc/typedstream.h
index a52aa7e3a973108280c651c7209893080d8ca44f..3a5e0b3b80cfd0427bf8cf2d434b42b439683ca8 100644
--- a/libobjc/objc/typedstream.h
+++ b/libobjc/objc/typedstream.h
@@ -15,8 +15,8 @@ License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled
    with GCC to produce an executable, this does not cause the resulting
diff --git a/libobjc/objects.c b/libobjc/objects.c
index c3732e3a444e5d1e841686bd662f439ff4815644..7cc99bfcad5c7f540a06ff7fc1936abbfd11b8bc 100644
--- a/libobjc/objects.c
+++ b/libobjc/objects.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/sarray.c b/libobjc/sarray.c
index f07097ac2093ebf47b13fca9da3495494ff8b7ea..b35772b3f53c2865d83680e00437d7bfbe5da08b 100644
--- a/libobjc/sarray.c
+++ b/libobjc/sarray.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
diff --git a/libobjc/selector.c b/libobjc/selector.c
index 86673339bfb1e9d8a945f7efa7e860e39a2f4c7d..223c7100efa56dcddba58ffda8e79f3cd53602f5 100644
--- a/libobjc/selector.c
+++ b/libobjc/selector.c
@@ -15,7 +15,7 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c
index 414af70ed6da52aa535647b33b16515b40463226..9453ef3dd464add414322eef6001b7da4e6d89ba 100644
--- a/libobjc/sendmsg.c
+++ b/libobjc/sendmsg.c
@@ -16,8 +16,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-dce.c b/libobjc/thr-dce.c
index 166d61f6f2149cbca18f573f91578d7bb082e9ff..b20eacf8c95097dcea9f707c30086ad5872167ea 100644
--- a/libobjc/thr-dce.c
+++ b/libobjc/thr-dce.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-decosf1.c b/libobjc/thr-decosf1.c
index 166d61f6f2149cbca18f573f91578d7bb082e9ff..b20eacf8c95097dcea9f707c30086ad5872167ea 100644
--- a/libobjc/thr-decosf1.c
+++ b/libobjc/thr-decosf1.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-irix.c b/libobjc/thr-irix.c
index 9ad55bb3be27ad550cf0ef34a703657422cc4266..ca68e08a49193e05e27bf7c0ed1acbab378cbc6e 100644
--- a/libobjc/thr-irix.c
+++ b/libobjc/thr-irix.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-mach.c b/libobjc/thr-mach.c
index 7d70625562e3a378087bf2255e6bda3f37c0a96a..76167b42af2a091aa107d6d839d8fbb6d1216d45 100644
--- a/libobjc/thr-mach.c
+++ b/libobjc/thr-mach.c
@@ -17,8 +17,8 @@ details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-objc.c b/libobjc/thr-objc.c
index 25f9762b086bfdcea413ba7704e1e788e0157443..f2e8c391d70d9699dfdfc9efede95d3629904373 100644
--- a/libobjc/thr-objc.c
+++ b/libobjc/thr-objc.c
@@ -14,8 +14,8 @@ details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-os2.c b/libobjc/thr-os2.c
index e302006ab19aa68735ac8cd6ef2eecb5ebfc4244..787c9494bfb94cc2b16ef1ec8e6776ce998de729 100644
--- a/libobjc/thr-os2.c
+++ b/libobjc/thr-os2.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-posix.c b/libobjc/thr-posix.c
index 9871b57691fa8ccb34048cf4cfc3d1bbaba07cdb..f7010833df8f3d0ddf6e511bedd4e0af0219eef8 100644
--- a/libobjc/thr-posix.c
+++ b/libobjc/thr-posix.c
@@ -17,8 +17,8 @@ details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-pthreads.c b/libobjc/thr-pthreads.c
index 99321c8e93f43d05ace1d062a982e14e61ec07be..d73db47ad2e6ad482ee4ac00f23eaf0415a615ea 100644
--- a/libobjc/thr-pthreads.c
+++ b/libobjc/thr-pthreads.c
@@ -16,8 +16,8 @@ details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-rtems.c b/libobjc/thr-rtems.c
index eab889240568ee94d1a318a9725ac7ca2b880666..4e4f1e493ad7b44e2732fcff7076362fe9f97ae4 100644
--- a/libobjc/thr-rtems.c
+++ b/libobjc/thr-rtems.c
@@ -17,8 +17,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-single.c b/libobjc/thr-single.c
index 132307448e74a775057714253ee9c6738dcf0a5e..0407dcf17cfd31ab016285e574c6adb7f606721c 100644
--- a/libobjc/thr-single.c
+++ b/libobjc/thr-single.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-solaris.c b/libobjc/thr-solaris.c
index d37013b132d977f0dfa3a1b2005cbb91260ba542..0cc352267248e7775f6c5e595da0c01b263f336a 100644
--- a/libobjc/thr-solaris.c
+++ b/libobjc/thr-solaris.c
@@ -16,8 +16,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-vxworks.c b/libobjc/thr-vxworks.c
index 132307448e74a775057714253ee9c6738dcf0a5e..0407dcf17cfd31ab016285e574c6adb7f606721c 100644
--- a/libobjc/thr-vxworks.c
+++ b/libobjc/thr-vxworks.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr-win32.c b/libobjc/thr-win32.c
index 065242ce8ff99ce986b0ce2b455d02fc8fd2c769..cc4bb746e136bc917a0c2f0a63a75ec3edb4cdd2 100644
--- a/libobjc/thr-win32.c
+++ b/libobjc/thr-win32.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libobjc/thr.c b/libobjc/thr.c
index 91e15d522523626ffa3aaef4a64b685e70759857..17f6f7e2920a29e30fc32965407b935a8e129fa9 100644
--- a/libobjc/thr.c
+++ b/libobjc/thr.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable