Update FSF address

78 files changed, 139 insertions, 111 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0bea730..b6dff3e 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,19 @@
+2005-05-07  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	aclocal.m4, addr2line.c, ar.c, arlex.l, arparse.y, arsup.c,
+	arsup.h, binemul.c, binemul.h, bucomm.c, bucomm.h, budbg.h,
+	budemang.c, budemang.h, coffdump.c, coffgrok.c, coffgrok.h,
+	cxxfilt.c, debug.c, debug.h, deflex.l, defparse.y, dlltool.c,
+	dlltool.h, dllwrap.c, emul_aix.c, emul_vanilla.c, filemode.c,
+	ieee.c, nlmconv.c, nlmconv.h, nlmheader.y, nm.c, objcopy.c,
+	objdump.c, prdbg.c, rclex.l, rcparse.y, rdcoff.c, rddbg.c,
+	readelf.c, rename.c, resbin.c, rescoff.c, resrc.c, resres.c,
+	size.c, srconv.c, stabs.c, strings.c, sysdump.c, sysinfo.y,
+	syslex.l, unwind-ia64.c, unwind-ia64.h, version.c, windres.c,
+	windres.h, winduni.c, winduni.h wrstabs.c, doc/fdl.texi
+
 2005-05-06  Jan Beulich  <jbeulich@novell.com>
 
 	* objcopy.c (copy_file): Don't delete output upon error here.
diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index 49cfc4c..012618c 100644
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -112,7 +112,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 # 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
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 18d8753..b4f48fc 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -17,7 +17,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.  */
 
 /* Derived from objdump.c and nm.c by Ulrich.Lauther@mchp.siemens.de
 
diff --git a/binutils/ar.c b/binutils/ar.c
index 483be10..e8b0379 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -17,7 +17,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.  */
 
 /*
    Bugs: should use getopt the way tar does (complete w/optional -) and
diff --git a/binutils/arlex.l b/binutils/arlex.l
index 500f407..1560294 100644
--- a/binutils/arlex.l
+++ b/binutils/arlex.l
@@ -18,7 +18,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
 /* Contributed by Steve Chamberlain <sac@cygnus.com>.  */
diff --git a/binutils/arparse.y b/binutils/arparse.y
index d1c2fa5..a7ea015 100644
--- a/binutils/arparse.y
+++ b/binutils/arparse.y
@@ -18,7 +18,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
 /* Contributed by Steve Chamberlain
diff --git a/binutils/arsup.c b/binutils/arsup.c
index f94ebb9..189490b 100644
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -16,7 +16,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.  */
 
 
 /* Contributed by Steve Chamberlain
diff --git a/binutils/arsup.h b/binutils/arsup.h
index bb7e87d..136efcf 100644
--- a/binutils/arsup.h
+++ b/binutils/arsup.h
@@ -16,7 +16,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 struct list {
 	char *name;
diff --git a/binutils/binemul.c b/binutils/binemul.c
index 3193a80..cbe21a8 100644
--- a/binutils/binemul.c
+++ b/binutils/binemul.c
@@ -16,7 +16,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.  */
 
 #include "binemul.h"
 
diff --git a/binutils/binemul.h b/binutils/binemul.h
index 5cfbde9..c03cff0 100644
--- a/binutils/binemul.h
+++ b/binutils/binemul.h
@@ -16,7 +16,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.  */
 
 #ifndef BINEMUL_H
 #define BINEMUL_H
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 6573e2d..f29e666 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -16,8 +16,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.  */
 
 /* We might put this in a library someday so it could be dynamically
    loaded, but for now it's not necessary.  */
diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index d724586..aa152fa 100644
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -16,7 +16,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.  */
 
 #ifndef _BUCOMM_H
 #define _BUCOMM_H
diff --git a/binutils/budbg.h b/binutils/budbg.h
index f5c03bd..3524190 100644
--- a/binutils/budbg.h
+++ b/binutils/budbg.h
@@ -16,8 +16,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.  */
 
 #ifndef BUDBG_H
 #define BUDBG_H
diff --git a/binutils/budemang.c b/binutils/budemang.c
index b401e72..55f10b7 100644
--- a/binutils/budemang.c
+++ b/binutils/budemang.c
@@ -15,8 +15,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.  */
 
 #include "config.h"
 #include <stdlib.h>
diff --git a/binutils/budemang.h b/binutils/budemang.h
index b837d71..17df9f5 100644
--- a/binutils/budemang.h
+++ b/binutils/budemang.h
@@ -15,8 +15,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.  */
 #ifndef BUDEMANG_H
 #define BUDEMANG_H
 
diff --git a/binutils/coffdump.c b/binutils/coffdump.c
index 058c3ab..c79c978 100644
--- a/binutils/coffdump.c
+++ b/binutils/coffdump.c
@@ -16,7 +16,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.  */
 
 /* Written by Steve Chamberlain <sac@cygnus.com>
 
diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c
index fe57709..a6c05b1 100644
--- a/binutils/coffgrok.c
+++ b/binutils/coffgrok.c
@@ -16,7 +16,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Steve Chamberlain (sac@cygnus.com)
 
diff --git a/binutils/coffgrok.h b/binutils/coffgrok.h
index 6ed215e..e6d0077 100644
--- a/binutils/coffgrok.h
+++ b/binutils/coffgrok.h
@@ -15,7 +15,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define T_NULL		0
 #define T_VOID		1	/* function argument (only used by compiler) */
diff --git a/binutils/cxxfilt.c b/binutils/cxxfilt.c
index 3fe1fd5..25e8e35 100644
--- a/binutils/cxxfilt.c
+++ b/binutils/cxxfilt.c
@@ -19,8 +19,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"
 #include "bfd.h"
diff --git a/binutils/debug.c b/binutils/debug.c
index e35b691..07d38ac 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -17,8 +17,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.  */
 
 /* This file implements a generic debugging format.  We may eventually
    have readers which convert different formats into this generic
diff --git a/binutils/debug.h b/binutils/debug.h
index 3331e0b..c18ba54 100644
--- a/binutils/debug.h
+++ b/binutils/debug.h
@@ -16,8 +16,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.  */
 
 #ifndef DEBUG_H
 #define DEBUG_H
diff --git a/binutils/deflex.l b/binutils/deflex.l
index 5ff4c79..68bd1f9 100644
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -17,7 +17,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.  */
 
 
 /* Contributed by Steve Chamberlain: sac@cygnus.com  */
diff --git a/binutils/defparse.y b/binutils/defparse.y
index b384592..81b4c61 100644
--- a/binutils/defparse.y
+++ b/binutils/defparse.y
@@ -17,7 +17,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.  */
 
 #include "bfd.h"
 #include "bucomm.h"
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index ffcb6ed..760f437 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -16,8 +16,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.  */
 
 
 /* This program allows you to build the files necessary to create
diff --git a/binutils/dlltool.h b/binutils/dlltool.h
index f488d96..e2634ea 100644
--- a/binutils/dlltool.h
+++ b/binutils/dlltool.h
@@ -15,8 +15,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.  */
 
 #include "ansidecl.h"
 #include <stdio.h>
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 577772f..0c01f5f 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -16,8 +16,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.  */
 
 /* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__
diff --git a/binutils/doc/fdl.texi b/binutils/doc/fdl.texi
index a85dbda..cb9b4ae 100644
--- a/binutils/doc/fdl.texi
+++ b/binutils/doc/fdl.texi
@@ -6,7 +6,7 @@
 
 @display
 Copyright (C) 2000, 2003  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c
index c58846f..40590cc 100644
--- a/binutils/emul_aix.c
+++ b/binutils/emul_aix.c
@@ -16,7 +16,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.  */
 
 #include "binemul.h"
 #include "bfdlink.h"
diff --git a/binutils/emul_vanilla.c b/binutils/emul_vanilla.c
index 753d746..400f532 100644
--- a/binutils/emul_vanilla.c
+++ b/binutils/emul_vanilla.c
@@ -16,7 +16,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.  */
 
 #include "binemul.h"
 
diff --git a/binutils/filemode.c b/binutils/filemode.c
index 4b72035..78578c8 100644
--- a/binutils/filemode.c
+++ b/binutils/filemode.c
@@ -14,8 +14,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.  */
 
 #include "bfd.h"
 #include "bucomm.h"
diff --git a/binutils/ieee.c b/binutils/ieee.c
index 1b6df4f..4ffd8f5 100644
--- a/binutils/ieee.c
+++ b/binutils/ieee.c
@@ -17,8 +17,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.  */
 
 /* This file reads and writes IEEE-695 debugging information.  */
 
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c
index b7798eb..aa68b6e 100644
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -16,7 +16,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.  */
 
 /* Written by Ian Lance Taylor <ian@cygnus.com>.
 
diff --git a/binutils/nlmconv.h b/binutils/nlmconv.h
index 35c84ec..eb95124 100644
--- a/binutils/nlmconv.h
+++ b/binutils/nlmconv.h
@@ -15,7 +15,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Ian Lance Taylor <ian@cygnus.com>.
 
diff --git a/binutils/nlmheader.y b/binutils/nlmheader.y
index 884fcf2..b79d63a 100644
--- a/binutils/nlmheader.y
+++ b/binutils/nlmheader.y
@@ -16,7 +16,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Ian Lance Taylor <ian@cygnus.com>.
 
diff --git a/binutils/nm.c b/binutils/nm.c
index 917137f..511e6d3 100644
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -17,8 +17,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.  */
 
 #include "bfd.h"
 #include "progress.h"
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index a3bd95e..d8feae6 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -17,8 +17,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.  */
 
 #include "bfd.h"
 #include "progress.h"
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 52cd3d0..cec11de 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -17,7 +17,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.  */
 
 /* Objdump overview.
 
diff --git a/binutils/prdbg.c b/binutils/prdbg.c
index 0490b58..87a4934 100644
--- a/binutils/prdbg.c
+++ b/binutils/prdbg.c
@@ -18,8 +18,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.  */
 
 /* This file prints out the generic debugging information, by
    supplying a set of routines to debug_write.  */
diff --git a/binutils/rclex.l b/binutils/rclex.l
index 4028405..eb33b4a 100644
--- a/binutils/rclex.l
+++ b/binutils/rclex.l
@@ -17,8 +17,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.  */
 
 /* This is a lex input file which generates a lexer used by the
    Windows rc file parser.  It basically just recognized a bunch of
diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index c913022..fbc5bef 100644
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -17,8 +17,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.  */
 
 /* This is a parser for Windows rc files.  It is based on the parser
    by Gunther Ebert <gunther.ebert@ixos-leipzig.de>.  */
diff --git a/binutils/rdcoff.c b/binutils/rdcoff.c
index 67fd665..1eda3af 100644
--- a/binutils/rdcoff.c
+++ b/binutils/rdcoff.c
@@ -16,8 +16,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.  */
 
 /* This file contains code which parses COFF debugging information.  */
 
diff --git a/binutils/rddbg.c b/binutils/rddbg.c
index 75ddab5..48fc5df 100644
--- a/binutils/rddbg.c
+++ b/binutils/rddbg.c
@@ -17,8 +17,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.  */
 
 /* This file reads debugging information into a generic form.  This
    file knows how to dig the debugging information out of an object
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 7ff2c6e..715b830 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -19,8 +19,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.  */
 
 /* The difference between readelf and objdump:
 
diff --git a/binutils/rename.c b/binutils/rename.c
index 398152e..74d04d4 100644
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -15,8 +15,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.  */
 
 #include "bfd.h"
 #include "bucomm.h"
diff --git a/binutils/resbin.c b/binutils/resbin.c
index ad14bda..6ea9338 100644
--- a/binutils/resbin.c
+++ b/binutils/resbin.c
@@ -17,8 +17,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.  */
 
 /* This file contains functions to convert between the binary resource
    format and the internal structures that we want to use.  The same
diff --git a/binutils/rescoff.c b/binutils/rescoff.c
index 60122de..fdd9aad 100644
--- a/binutils/rescoff.c
+++ b/binutils/rescoff.c
@@ -17,8 +17,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.  */
 
 /* This file contains function that read and write Windows resources
    in COFF files.  */
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 296bd69..73b482c 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -17,8 +17,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.  */
 
 /* This file contains functions that read and write Windows rc files.
    These are text files that represent resources.  */
diff --git a/binutils/resres.c b/binutils/resres.c
index 4077c2d..54d2a0c 100644
--- a/binutils/resres.c
+++ b/binutils/resres.c
@@ -16,8 +16,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.  */
 
 /* FIXME: This file does not work correctly in a cross configuration.
    It assumes that it can use fread and fwrite to read and write
diff --git a/binutils/size.c b/binutils/size.c
index 1e1dc39..021d503 100644
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -16,7 +16,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.  */
 
 /* Extensions/incompatibilities:
    o - BSD output has filenames at the end.
diff --git a/binutils/srconv.c b/binutils/srconv.c
index 4c909b7..1ae5b65 100644
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -16,8 +16,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.  */
 
 /* Written by Steve Chamberlain (sac@cygnus.com)
 
diff --git a/binutils/stabs.c b/binutils/stabs.c
index 42763e7..879a3e2 100644
--- a/binutils/stabs.c
+++ b/binutils/stabs.c
@@ -17,8 +17,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.  */
 
 /* This file contains code which parses stabs debugging information.
    The organization of this code is based on the gdb stabs reading
diff --git a/binutils/strings.c b/binutils/strings.c
index 2fcdb95..e5519e1 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -14,8 +14,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.  */
 
 /* Usage: strings [options] file...
 
diff --git a/binutils/sysdump.c b/binutils/sysdump.c
index b0fc6b0..2b38b2f 100644
--- a/binutils/sysdump.c
+++ b/binutils/sysdump.c
@@ -16,8 +16,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.  */
 
 
 /* Written by Steve Chamberlain <sac@cygnus.com>.
diff --git a/binutils/sysinfo.y b/binutils/sysinfo.y
index 233e70a..a707748 100644
--- a/binutils/sysinfo.y
+++ b/binutils/sysinfo.y
@@ -15,7 +15,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 %{
 #include <stdio.h>
diff --git a/binutils/syslex.l b/binutils/syslex.l
index 1e31d53..3a9306c 100644
--- a/binutils/syslex.l
+++ b/binutils/syslex.l
@@ -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 GLD; 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"
 #ifdef HAVE_STRING_H
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 25eabb7..e370dac 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-07  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	binutils-all/ar.exp, binutils-all/dlltool.exp,
+	binutils-all/nm.exp, binutils-all/objcopy.exp,
+	binutils-all/objdump.exp, binutils-all/readelf.exp,
+	binutils-all/size.exp, binutils-all/hppa/objdump.exp,
+	binutils-all/m68k/objdump.exp, binutils-all/vax/objdump.exp,
+	binutils-all/windres/msupdate, binutils-all/windres/windres.exp,
+	config/default.exp, lib/utils-lib.exp
+
 2005-04-04  Jan-Benedict Glaw  <jbglaw@lug-owl.>
 
 	* binutils-all/vax/objdump.exp: Condense the two tests into one
diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index 1089dfc..02d1235 100644
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
index cf718ea..6ddfcfa 100644
--- a/binutils/testsuite/binutils-all/dlltool.exp
+++ b/binutils/testsuite/binutils-all/dlltool.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.
 
 if {![istarget "i*86-*-*"]} {
     return
diff --git a/binutils/testsuite/binutils-all/hppa/objdump.exp b/binutils/testsuite/binutils-all/hppa/objdump.exp
index e0370a9..a445125 100644
--- a/binutils/testsuite/binutils-all/hppa/objdump.exp
+++ b/binutils/testsuite/binutils-all/hppa/objdump.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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/m68k/objdump.exp b/binutils/testsuite/binutils-all/m68k/objdump.exp
index 9db775e..4f56889 100644
--- a/binutils/testsuite/binutils-all/m68k/objdump.exp
+++ b/binutils/testsuite/binutils-all/m68k/objdump.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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 if {![istarget "m68*-*-*"] || [istarget "m68h*-*-*"] || [istarget "m681*-*-*"]} then {
   return
diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp
index 8069eda..865e5d3 100644
--- a/binutils/testsuite/binutils-all/nm.exp
+++ b/binutils/testsuite/binutils-all/nm.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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index db6c856..14330b5 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -14,7 +14,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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index af05f40..858020d 100644
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -14,7 +14,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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
index 7fd785d..8815fee 100644
--- a/binutils/testsuite/binutils-all/readelf.exp
+++ b/binutils/testsuite/binutils-all/readelf.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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/size.exp b/binutils/testsuite/binutils-all/size.exp
index b91ba23..e9b15b0 100644
--- a/binutils/testsuite/binutils-all/size.exp
+++ b/binutils/testsuite/binutils-all/size.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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/vax/objdump.exp b/binutils/testsuite/binutils-all/vax/objdump.exp
index b8bf221..ada84be 100644
--- a/binutils/testsuite/binutils-all/vax/objdump.exp
+++ b/binutils/testsuite/binutils-all/vax/objdump.exp
@@ -14,7 +14,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.
 #
 
 #
diff --git a/binutils/testsuite/binutils-all/windres/msupdate b/binutils/testsuite/binutils-all/windres/msupdate
index 649335c..31ceb07 100755
--- a/binutils/testsuite/binutils-all/windres/msupdate
+++ b/binutils/testsuite/binutils-all/windres/msupdate
@@ -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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
index 1abe0db..4189c55 100644
--- a/binutils/testsuite/binutils-all/windres/windres.exp
+++ b/binutils/testsuite/binutils-all/windres/windres.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.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
index f418abb..6ee5eda 100644
--- a/binutils/testsuite/config/default.exp
+++ b/binutils/testsuite/config/default.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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
index 1ca1443..bb819a3 100644
--- a/binutils/testsuite/lib/utils-lib.exp
+++ b/binutils/testsuite/lib/utils-lib.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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
diff --git a/binutils/unwind-ia64.c b/binutils/unwind-ia64.c
index 59ed024..f27a7ab 100644
--- a/binutils/unwind-ia64.c
+++ b/binutils/unwind-ia64.c
@@ -16,7 +16,7 @@ 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "unwind-ia64.h"
 #include <stdio.h>
diff --git a/binutils/unwind-ia64.h b/binutils/unwind-ia64.h
index 3b6ab22..c2fb9b9 100644
--- a/binutils/unwind-ia64.h
+++ b/binutils/unwind-ia64.h
@@ -16,7 +16,7 @@ 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "elf/ia64.h"
 #include "ansidecl.h"
diff --git a/binutils/version.c b/binutils/version.c
index 26595fd..2843e69 100644
--- a/binutils/version.c
+++ b/binutils/version.c
@@ -16,7 +16,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.  */
 
 #include <stdio.h>
 #include "bfd.h"
diff --git a/binutils/windres.c b/binutils/windres.c
index 24c5131..4336f00 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -17,8 +17,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.  */
 
 /* This program can read and write Windows resources in various
    formats.  In particular, it can act like the rc resource compiler
diff --git a/binutils/windres.h b/binutils/windres.h
index 6bdb6c2..6a9dfa7 100644
--- a/binutils/windres.h
+++ b/binutils/windres.h
@@ -17,8 +17,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.  */
 
 #include "ansidecl.h"
 
diff --git a/binutils/winduni.c b/binutils/winduni.c
index 41cfcfc..b172b5e 100644
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -16,8 +16,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.  */
 
 /* This file contains unicode support routines for the windres
    program.  Ideally, we would have generic unicode support which
diff --git a/binutils/winduni.h b/binutils/winduni.h
index c55189c..71cd055 100644
--- a/binutils/winduni.h
+++ b/binutils/winduni.h
@@ -16,8 +16,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.  */
 
 #include "ansidecl.h"
 
diff --git a/binutils/wrstabs.c b/binutils/wrstabs.c
index d600197..0feb4e2 100644
--- a/binutils/wrstabs.c
+++ b/binutils/wrstabs.c
@@ -17,8 +17,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.  */
 
 /* This file contains code which writes out stabs debugging
    information.  */