Update the address and phone number of the FSF organization

186 files changed, 282 insertions, 223 deletions

diff --git a/include/COPYING b/include/COPYING
index d60c31a..623b625 100644
--- a/include/COPYING
+++ b/include/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 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.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/include/ChangeLog b/include/ChangeLog
index 88f6de2..13dccfd 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	COPYING, ansidecl.h, bfdlink.h, bout.h, demangle.h, dis-asm.h,
+	dyn-string.h, fibheap.h, filenames.h, floatformat.h,
+	fnmatch.h, gdbm.h, getopt.h, hashtab.h, hp-symtab.h, ieee.h,
+	libiberty.h, md5.h, oasys.h, objalloc.h, obstack.h, os9k.h,
+	partition.h, progress.h, safe-ctype.h, sort.h, splay-tree.h,
+	symcat.h, ternary.h, xregex2.h, xtensa-config.h,
+	xtensa-isa-internal.h, xtensa-isa.h
+
 2005-04-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* libiberty.h (unlock_std_streams): New.
diff --git a/include/ansidecl.h b/include/ansidecl.h
index 2eeccf2..02bb412 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.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.  */
 
 /* ANSI and traditional C compatibility macros
 
diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog
index 148a020..e00c698 100644
--- a/include/aout/ChangeLog
+++ b/include/aout/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	adobe.h, aout64.h, ar.h, dynix3.h, encap.h, host.h, hp.h,
+	ranlib.h, reloc.h, stab.def, stab_gnu.h, sun4.h
+
 2004-01-06  Mark Kettenis  <kettenis@gnu.org>
 
 	* stab.def: Add N_PATCH to DO definition.
diff --git a/include/aout/adobe.h b/include/aout/adobe.h
index c751d10..2e81240 100644
--- a/include/aout/adobe.h
+++ b/include/aout/adobe.h
@@ -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.  */
 
 #ifndef __A_OUT_ADOBE_H__
 #define __A_OUT_ADOBE_H__
diff --git a/include/aout/aout64.h b/include/aout/aout64.h
index 170af69..2e289b3 100644
--- a/include/aout/aout64.h
+++ b/include/aout/aout64.h
@@ -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.  */
 
 #ifndef __A_OUT_64_H__
 #define __A_OUT_64_H__
diff --git a/include/aout/ar.h b/include/aout/ar.h
index 15d534c..0d0aad2 100644
--- a/include/aout/ar.h
+++ b/include/aout/ar.h
@@ -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.  */
 
 /* So far this is correct for BSDish archives.  Don't forget that
    files must begin on an even byte boundary. */
diff --git a/include/aout/dynix3.h b/include/aout/dynix3.h
index b09d5d7..e7c5110 100644
--- a/include/aout/dynix3.h
+++ b/include/aout/dynix3.h
@@ -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.  */
 
 #ifndef A_OUT_DYNIX3_H
 #define A_OUT_DYNIX3_H
diff --git a/include/aout/encap.h b/include/aout/encap.h
index 1381557..0808ae6 100644
--- a/include/aout/encap.h
+++ b/include/aout/encap.h
@@ -17,7 +17,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.  */
 
 /*
  * We only use the coff headers to tell the kernel
diff --git a/include/aout/host.h b/include/aout/host.h
index 442981a..8807108 100644
--- a/include/aout/host.h
+++ b/include/aout/host.h
@@ -15,7 +15,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.  */
 
 /* Address of data segment in memory after it is loaded.
    It is up to you to define SEGMENT_SIZE on machines not listed here.  */
diff --git a/include/aout/hp.h b/include/aout/hp.h
index 002f49c..96471c7 100644
--- a/include/aout/hp.h
+++ b/include/aout/hp.h
@@ -13,7 +13,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.  */
 
 /* THIS FILE IS OBSOLETE.  It needs to be revised as a variant "external"
    a.out format for use with BFD.  */
diff --git a/include/aout/ranlib.h b/include/aout/ranlib.h
index e4603ed..8695b05 100644
--- a/include/aout/ranlib.h
+++ b/include/aout/ranlib.h
@@ -13,7 +13,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.  */
 
 /* The Symdef member of an archive contains two things:
    a table that maps symbol-string offsets to file offsets,
diff --git a/include/aout/reloc.h b/include/aout/reloc.h
index eca3f59..c4ce1c4 100644
--- a/include/aout/reloc.h
+++ b/include/aout/reloc.h
@@ -13,7 +13,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.  */
 
 /* Relocation types for a.out files using reloc_info_extended
    (SPARC and AMD 29000). */
diff --git a/include/aout/stab.def b/include/aout/stab.def
index 8188b84..04ad1f1 100644
--- a/include/aout/stab.def
+++ b/include/aout/stab.def
@@ -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.  */
 
 /* New stab from Solaris 2.  This uses an n_type of 0, which in a.out files
    overlaps the N_UNDF used for ordinary symbols.  In ELF files, the
diff --git a/include/aout/stab_gnu.h b/include/aout/stab_gnu.h
index c62ac6e..29dc990 100644
--- a/include/aout/stab_gnu.h
+++ b/include/aout/stab_gnu.h
@@ -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.  */
 #ifndef __GNU_STAB__
 
 /* Indicate the GNU stab.h is in use.  */
diff --git a/include/aout/sun4.h b/include/aout/sun4.h
index 623afc1..8cf0517 100644
--- a/include/aout/sun4.h
+++ b/include/aout/sun4.h
@@ -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.  */
 
 /* Some systems, e.g., AIX, may have defined this in header files already
    included.  */
diff --git a/include/bfdlink.h b/include/bfdlink.h
index ad32906..28c88fb 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -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.  */
 
 #ifndef BFDLINK_H
 #define BFDLINK_H
diff --git a/include/bout.h b/include/bout.h
index a69e280..66a7bcf 100644
--- a/include/bout.h
+++ b/include/bout.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.  */
  
 /* All i80960 development is done in a CROSS-DEVELOPMENT environment.  I.e.,
    object code is generated on, and executed under the direction of a symbolic
diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index 88cf310..822beb1 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	a29k.h,	alpha.h, apollo.h, arm.h, aux-coff.h, ecoff.h, external.h,
+	go32exe.h, h8300.h, h8500.h, i386.h, i860.h, i960.h, ia64.h,
+	internal.h, m68k.h, m88k.h, maxq.h, mcore.h, mips.h, mipspe.h,
+	or32.h, pe.h, powerpc.h, rs6k64.h, sh.h, sparc.h, ti.h, tic30.h,
+	tic4x.h, tic54x.h, tic80.h, w65.h, we32k.h, xcoff.h, z8k.h
+	
 2005-02-21  Alan Modra  <amodra@bigpond.net.au>
 
 	* xcoff.h (struct xcoff_loader_info): Warning fix.
diff --git a/include/coff/a29k.h b/include/coff/a29k.h
index 673e716..61dc8e0 100644
--- a/include/coff/a29k.h
+++ b/include/coff/a29k.h
@@ -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.
    
    Contributed by David Wood @ New York University. */
  
diff --git a/include/coff/alpha.h b/include/coff/alpha.h
index e5210a5..3b00c92 100644
--- a/include/coff/alpha.h
+++ b/include/coff/alpha.h
@@ -15,7 +15,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.  */
    
 /********************** FILE HEADER **********************/
 
diff --git a/include/coff/apollo.h b/include/coff/apollo.h
index 4628459..963c0be 100644
--- a/include/coff/apollo.h
+++ b/include/coff/apollo.h
@@ -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.  */
 
 #define DO_NOT_DEFINE_AOUTHDR
 #define L_LNNO_SIZE 2
diff --git a/include/coff/arm.h b/include/coff/arm.h
index b05fa0f..750f7f2 100644
--- a/include/coff/arm.h
+++ b/include/coff/arm.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define COFFARM 1
 
diff --git a/include/coff/aux-coff.h b/include/coff/aux-coff.h
index f8536c9..5199f2c 100644
--- a/include/coff/aux-coff.h
+++ b/include/coff/aux-coff.h
@@ -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.
    
    Suggested by Ian Lance Taylor <ian@cygnus.com> */
 
diff --git a/include/coff/ecoff.h b/include/coff/ecoff.h
index 5726a19..4bd8a6c 100644
--- a/include/coff/ecoff.h
+++ b/include/coff/ecoff.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 ECOFF_H
 #define ECOFF_H
diff --git a/include/coff/external.h b/include/coff/external.h
index 19636da..9e760bd 100644
--- a/include/coff/external.h
+++ b/include/coff/external.h
@@ -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.  */
 
 #ifndef COFF_EXTERNAL_H
 #define COFF_EXTERNAL_H
diff --git a/include/coff/go32exe.h b/include/coff/go32exe.h
index ccd5c91..c85da0c 100644
--- a/include/coff/go32exe.h
+++ b/include/coff/go32exe.h
@@ -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.  */
 
 #define STUBSIZE 2048
 
diff --git a/include/coff/h8300.h b/include/coff/h8300.h
index 908848c..93be6ef 100644
--- a/include/coff/h8300.h
+++ b/include/coff/h8300.h
@@ -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.  */
 
 #define L_LNNO_SIZE 4
 #include "coff/external.h"
diff --git a/include/coff/h8500.h b/include/coff/h8500.h
index 62968ca..8d4e4114 100644
--- a/include/coff/h8500.h
+++ b/include/coff/h8500.h
@@ -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.  */
 
 #define L_LNNO_SIZE 4
 #include "coff/external.h"
diff --git a/include/coff/i386.h b/include/coff/i386.h
index 484a3b1..023b302 100644
--- a/include/coff/i386.h
+++ b/include/coff/i386.h
@@ -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.  */
 
 #define L_LNNO_SIZE 2
 #define INCLUDE_COMDAT_FIELDS_IN_AUXENT
diff --git a/include/coff/i860.h b/include/coff/i860.h
index c7072b2..6e8d1b4 100644
--- a/include/coff/i860.h
+++ b/include/coff/i860.h
@@ -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.  */
 
 /* This file was hacked from i386.h   [dolan@ssd.intel.com] */
 
diff --git a/include/coff/i960.h b/include/coff/i960.h
index b9d167e..b5ff6a5 100644
--- a/include/coff/i960.h
+++ b/include/coff/i960.h
@@ -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.  */
 
 /* NOTE: Tagentries (cf TAGBITS) are no longer used by the 960 */
 
diff --git a/include/coff/ia64.h b/include/coff/ia64.h
index 978255d..dd04f62 100644
--- a/include/coff/ia64.h
+++ b/include/coff/ia64.h
@@ -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.  */
 
 #define DO_NOT_DEFINE_AOUTHDR
 #define L_LNNO_SIZE 2
diff --git a/include/coff/internal.h b/include/coff/internal.h
index a400e8c..20e06c2 100644
--- a/include/coff/internal.h
+++ b/include/coff/internal.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 GNU_COFF_INTERNAL_H
 #define GNU_COFF_INTERNAL_H 1
diff --git a/include/coff/m68k.h b/include/coff/m68k.h
index 5c5f758..4e88cea 100644
--- a/include/coff/m68k.h
+++ b/include/coff/m68k.h
@@ -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.  */
 
 #ifndef GNU_COFF_M68K_H
 #define GNU_COFF_M68K_H 1
diff --git a/include/coff/m88k.h b/include/coff/m88k.h
index 331d97c..9aeff1e 100644
--- a/include/coff/m88k.h
+++ b/include/coff/m88k.h
@@ -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.  */
 
 #define DO_NOT_DEFINE_SCNHDR
 #define L_LNNO_SIZE 4
diff --git a/include/coff/maxq.h b/include/coff/maxq.h
index 694a3fa..a8e3c40 100644
--- a/include/coff/maxq.h
+++ b/include/coff/maxq.h
@@ -13,8 +13,8 @@
    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.
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
    Contributed by Vineet Sharma(vineets@noida.hcltech.com) Inderpreet
    S.(inderpreetb@noida.hcltech.com) HCL Technologies Ltd.  */
diff --git a/include/coff/mcore.h b/include/coff/mcore.h
index 02579c4..42c694c 100644
--- a/include/coff/mcore.h
+++ b/include/coff/mcore.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.  */
 
 /* This file holds definitions specific to the MCore COFF/PE ABI. */
 
diff --git a/include/coff/mips.h b/include/coff/mips.h
index e3d2c1c..feb2652 100644
--- a/include/coff/mips.h
+++ b/include/coff/mips.h
@@ -15,7 +15,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 DO_NOT_DEFINE_AOUTHDR
 #define L_LNNO_SIZE 4
diff --git a/include/coff/mipspe.h b/include/coff/mipspe.h
index cd2480b..c1c2efa 100644
--- a/include/coff/mipspe.h
+++ b/include/coff/mipspe.h
@@ -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.  */
 
 #define L_LNNO_SIZE 2
 #define INCLUDE_COMDAT_FIELDS_IN_AUXENT
diff --git a/include/coff/or32.h b/include/coff/or32.h
index c2797aa..65495fb 100644
--- a/include/coff/or32.h
+++ b/include/coff/or32.h
@@ -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.  */
 
 #ifndef OR32
 # define OR32
diff --git a/include/coff/pe.h b/include/coff/pe.h
index 4d36219..643cea4 100644
--- a/include/coff/pe.h
+++ b/include/coff/pe.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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 #ifndef _PE_H
 #define _PE_H
 
diff --git a/include/coff/powerpc.h b/include/coff/powerpc.h
index 1d4d6fb..0b11055 100644
--- a/include/coff/powerpc.h
+++ b/include/coff/powerpc.h
@@ -15,7 +15,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.
  
    Initial release: Kim Knuttila (krk@cygnus.com)  */
 #define L_LNNO_SIZE 2
diff --git a/include/coff/rs6k64.h b/include/coff/rs6k64.h
index 4eab91d..388818d 100644
--- a/include/coff/rs6k64.h
+++ b/include/coff/rs6k64.h
@@ -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.  */
 
 /********************** FILE HEADER **********************/
 
diff --git a/include/coff/sh.h b/include/coff/sh.h
index d224379..5349a10 100644
--- a/include/coff/sh.h
+++ b/include/coff/sh.h
@@ -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.  */
 
 #ifdef COFF_WITH_PE
 #define L_LNNO_SIZE 2
diff --git a/include/coff/sparc.h b/include/coff/sparc.h
index ac524d6..fb475f1 100644
--- a/include/coff/sparc.h
+++ b/include/coff/sparc.h
@@ -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.  */
 
 /* This file is an amalgamation of several standard include files that
    define coff format, such as filehdr.h, aouthdr.h, and so forth.  In
diff --git a/include/coff/ti.h b/include/coff/ti.h
index cf5ffea..4c246d4 100644
--- a/include/coff/ti.h
+++ b/include/coff/ti.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 COFF_TI_H
 #define COFF_TI_H
 
diff --git a/include/coff/tic30.h b/include/coff/tic30.h
index 30bf9dc..0da61d7 100644
--- a/include/coff/tic30.h
+++ b/include/coff/tic30.h
@@ -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.  */
 
 #define L_LNNO_SIZE 4
 #include "coff/external.h"
diff --git a/include/coff/tic4x.h b/include/coff/tic4x.h
index 0d224b2..433590e 100644
--- a/include/coff/tic4x.h
+++ b/include/coff/tic4x.h
@@ -15,7 +15,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 COFF_TIC4X_H
 #define COFF_TIC4X_H
diff --git a/include/coff/tic54x.h b/include/coff/tic54x.h
index e8bac07..a65511b 100644
--- a/include/coff/tic54x.h
+++ b/include/coff/tic54x.h
@@ -15,7 +15,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 COFF_TIC54X_H
 #define COFF_TIC54X_H
diff --git a/include/coff/tic80.h b/include/coff/tic80.h
index c9347eb..ed4b5c8 100644
--- a/include/coff/tic80.h
+++ b/include/coff/tic80.h
@@ -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.  */
 
 #define DO_NOT_DEFINE_FILHDR
 #define DO_NOT_DEFINE_SCNHDR
diff --git a/include/coff/w65.h b/include/coff/w65.h
index 0baa3d3..8132970 100644
--- a/include/coff/w65.h
+++ b/include/coff/w65.h
@@ -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.  */
 
 #define L_LNNO_SIZE 4
 #include "coff/external.h"
diff --git a/include/coff/we32k.h b/include/coff/we32k.h
index 7e2791c..933307f 100644
--- a/include/coff/we32k.h
+++ b/include/coff/we32k.h
@@ -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.  */
 #define L_LNNO_SIZE 2
 #include "coff/external.h"
 
diff --git a/include/coff/xcoff.h b/include/coff/xcoff.h
index a70449e..7c1eef5 100644
--- a/include/coff/xcoff.h
+++ b/include/coff/xcoff.h
@@ -18,7 +18,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 _INTERNAL_XCOFF_H
 #define _INTERNAL_XCOFF_H
diff --git a/include/coff/z8k.h b/include/coff/z8k.h
index 50cbd6b..cfd5f04 100644
--- a/include/coff/z8k.h
+++ b/include/coff/z8k.h
@@ -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.  */
 
 #define L_LNNO_SIZE 4
 #include "coff/external.h"
diff --git a/include/demangle.h b/include/demangle.h
index b88b43d..944a951 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -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.  */
 
 
 #if !defined (DEMANGLE_H)
diff --git a/include/dis-asm.h b/include/dis-asm.h
index 05d0507..93327e1 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.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.
    
    Written by Cygnus Support, 1993.
 
diff --git a/include/dyn-string.h b/include/dyn-string.h
index a351ec3..44e33de 100644
--- a/include/dyn-string.h
+++ b/include/dyn-string.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.  */
 
 
 typedef struct dyn_string
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 3515bc3..cf848c2 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+        alpha.h, arc.h, arm.h, avr.h, common.h, cr16c.h, cris.h, crx.h,
+	d10v.h, d30v.h, dlx.h, dwarf.h, dwarf2.h, external.h, fr30.h,
+	frv.h, h8.h, hppa.h, i370.h, i386.h, i860.h, i960.h, ia64.h,
+	internal.h, ip2k.h, iq2000.h, m32r.h, m68hc11.h, m68k.h, mcore.h,
+	mips.h, mmix.h, mn10200.h, mn10300.h, msp430.h, openrisc.h,
+	or32.h, pj.h, ppc.h, ppc64.h, reloc-macros.h, s390.h, sh.h,
+	sparc.h, v850.h,  vax.h, x86-64.h, xstormy16.h,	xtensa.h
+	
 2005-04-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Moved from ../ChangeLog
diff --git a/include/elf/alpha.h b/include/elf/alpha.h
index 4cee149..5b5c411 100644
--- a/include/elf/alpha.h
+++ b/include/elf/alpha.h
@@ -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.  */
 
 /* This file holds definitions specific to the ALPHA ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/arc.h b/include/elf/arc.h
index 6e94c29d..e2f4f41 100644
--- a/include/elf/arc.h
+++ b/include/elf/arc.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.  */
 
 /* This file holds definitions specific to the ARC ELF ABI.  */
 
diff --git a/include/elf/arm.h b/include/elf/arm.h
index 81a8de1..5e4d037 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_ARM_H
 #define _ELF_ARM_H
diff --git a/include/elf/avr.h b/include/elf/avr.h
index 86905cf..68b4d95 100644
--- a/include/elf/avr.h
+++ b/include/elf/avr.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.  */
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_AVR_H
 #define _ELF_AVR_H
diff --git a/include/elf/common.h b/include/elf/common.h
index db92ff6..0a11557 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -21,7 +21,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.  */
 
 
 /* This file is part of ELF support for BFD, and contains the portions
diff --git a/include/elf/cr16c.h b/include/elf/cr16c.h
index 1a91afe..de66a49 100644
--- a/include/elf/cr16c.h
+++ b/include/elf/cr16c.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_CR16C_H
 #define _ELF_CR16C_H
diff --git a/include/elf/cris.h b/include/elf/cris.h
index 5af5576..8225baa 100644
--- a/include/elf/cris.h
+++ b/include/elf/cris.h
@@ -17,7 +17,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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_CRIS_H
 #define _ELF_CRIS_H
diff --git a/include/elf/crx.h b/include/elf/crx.h
index 33ba005..4893d48 100644
--- a/include/elf/crx.h
+++ b/include/elf/crx.h
@@ -18,7 +18,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_CRX_H
 #define _ELF_CRX_H
diff --git a/include/elf/d10v.h b/include/elf/d10v.h
index 5bc613b..bc32d8e 100644
--- a/include/elf/d10v.h
+++ b/include/elf/d10v.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_D10V_H
 #define _ELF_D10V_H
diff --git a/include/elf/d30v.h b/include/elf/d30v.h
index 5abb06a..8483a78 100644
--- a/include/elf/d30v.h
+++ b/include/elf/d30v.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_D30V_H
 #define _ELF_D30V_H
diff --git a/include/elf/dlx.h b/include/elf/dlx.h
index 562f600..eea5b80 100644
--- a/include/elf/dlx.h
+++ b/include/elf/dlx.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_DLX_H
 #define _ELF_DLX_H
diff --git a/include/elf/dwarf.h b/include/elf/dwarf.h
index 170d60a..6f1bca3 100644
--- a/include/elf/dwarf.h
+++ b/include/elf/dwarf.h
@@ -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.  */
 
 /* This file is derived from the DWARF specification (a public document)
    Revision 1.0.1 (April 8, 1992) developed by the UNIX International
diff --git a/include/elf/dwarf2.h b/include/elf/dwarf2.h
index 9458907..6932489 100644
--- a/include/elf/dwarf2.h
+++ b/include/elf/dwarf2.h
@@ -24,8 +24,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.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, 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/include/elf/external.h b/include/elf/external.h
index e87db93..a7fc767 100644
--- a/include/elf/external.h
+++ b/include/elf/external.h
@@ -20,7 +20,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.  */
 
 
 /* This file is part of ELF support for BFD, and contains the portions
diff --git a/include/elf/fr30.h b/include/elf/fr30.h
index 12a450d..eb2b937 100644
--- a/include/elf/fr30.h
+++ b/include/elf/fr30.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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_FR30_H
 #define _ELF_FR30_H
diff --git a/include/elf/frv.h b/include/elf/frv.h
index 5e6f220..f2b1097 100644
--- a/include/elf/frv.h
+++ b/include/elf/frv.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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_FRV_H
 #define _ELF_FRV_H
diff --git a/include/elf/h8.h b/include/elf/h8.h
index 1aad7a4..1a115ad 100644
--- a/include/elf/h8.h
+++ b/include/elf/h8.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_H8_H
 #define _ELF_H8_H
diff --git a/include/elf/hppa.h b/include/elf/hppa.h
index 45e0b9f..e745882 100644
--- a/include/elf/hppa.h
+++ b/include/elf/hppa.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.  */
 
 /* This file holds definitions specific to the HPPA ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/i370.h b/include/elf/i370.h
index fd5ec47..27bfdcc 100644
--- a/include/elf/i370.h
+++ b/include/elf/i370.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.  */
 
 /* This file holds definitions specific to the i370 ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/i386.h b/include/elf/i386.h
index f361edc..5a4d330 100644
--- a/include/elf/i386.h
+++ b/include/elf/i386.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_I386_H
 #define _ELF_I386_H
diff --git a/include/elf/i860.h b/include/elf/i860.h
index de34aeb..9e76dcd 100644
--- a/include/elf/i860.h
+++ b/include/elf/i860.h
@@ -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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_I860_H
 #define _ELF_I860_H
diff --git a/include/elf/i960.h b/include/elf/i960.h
index 253e438..b96aae9 100644
--- a/include/elf/i960.h
+++ b/include/elf/i960.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_I960_H
 #define _ELF_I960_H
diff --git a/include/elf/ia64.h b/include/elf/ia64.h
index 62b971c..2a9694e 100644
--- a/include/elf/ia64.h
+++ b/include/elf/ia64.h
@@ -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.  */
 
 #ifndef _ELF_IA64_H
 #define _ELF_IA64_H
diff --git a/include/elf/internal.h b/include/elf/internal.h
index eddf82e..7e13d54 100644
--- a/include/elf/internal.h
+++ b/include/elf/internal.h
@@ -20,7 +20,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.  */
 
 
 /* This file is part of ELF support for BFD, and contains the portions
diff --git a/include/elf/ip2k.h b/include/elf/ip2k.h
index c331b72..83fe1d4 100644
--- a/include/elf/ip2k.h
+++ b/include/elf/ip2k.h
@@ -15,7 +15,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.  */
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_IP2K_H
 #define _ELF_IP2K_H
diff --git a/include/elf/iq2000.h b/include/elf/iq2000.h
index 56fc0ca..012f253 100644
--- a/include/elf/iq2000.h
+++ b/include/elf/iq2000.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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_IQ2000_H
 #define _ELF_IQ2000_H
diff --git a/include/elf/m32r.h b/include/elf/m32r.h
index 6441efe..b82377a 100644
--- a/include/elf/m32r.h
+++ b/include/elf/m32r.h
@@ -15,7 +15,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.  */
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_M32R_H
 #define _ELF_M32R_H
diff --git a/include/elf/m68hc11.h b/include/elf/m68hc11.h
index 1902f7f..1cd4600 100644
--- a/include/elf/m68hc11.h
+++ b/include/elf/m68hc11.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_M68HC11_H
 #define _ELF_M68HC11_H
diff --git a/include/elf/m68k.h b/include/elf/m68k.h
index d6bc54f..05e2eb8 100644
--- a/include/elf/m68k.h
+++ b/include/elf/m68k.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_M68K_H
 #define _ELF_M68K_H
diff --git a/include/elf/mcore.h b/include/elf/mcore.h
index 387a57d..5600df7 100644
--- a/include/elf/mcore.h
+++ b/include/elf/mcore.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.  */
 
 /* This file holds definitions specific to the MCore ELF ABI. */
 #ifndef _ELF_MORE_H
diff --git a/include/elf/mips.h b/include/elf/mips.h
index 472a7c9..540815b 100644
--- a/include/elf/mips.h
+++ b/include/elf/mips.h
@@ -21,7 +21,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.  */
 
 /* This file holds definitions specific to the MIPS ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/mmix.h b/include/elf/mmix.h
index 89778e4..9661e87 100644
--- a/include/elf/mmix.h
+++ b/include/elf/mmix.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.  */
 
 /* This file holds definitions specific to the MMIX ELF ABI. */
 #ifndef ELF_MMIX_H
diff --git a/include/elf/mn10200.h b/include/elf/mn10200.h
index 1dfade5..8461588 100644
--- a/include/elf/mn10200.h
+++ b/include/elf/mn10200.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.  */
 
 /* This file holds definitions specific to the MN10200 ELF ABI. */
 
diff --git a/include/elf/mn10300.h b/include/elf/mn10300.h
index 5ae52f1..d241e9c 100644
--- a/include/elf/mn10300.h
+++ b/include/elf/mn10300.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.  */
 
 /* This file holds definitions specific to the MN10300 ELF ABI. */
 
diff --git a/include/elf/msp430.h b/include/elf/msp430.h
index 40ab2e2..ff16ba2 100644
--- a/include/elf/msp430.h
+++ b/include/elf/msp430.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.  */
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_MSP430_H
 #define _ELF_MSP430_H
diff --git a/include/elf/openrisc.h b/include/elf/openrisc.h
index c609906..326834e 100644
--- a/include/elf/openrisc.h
+++ b/include/elf/openrisc.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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_OPENRISC_H
 #define _ELF_OPENRISC_H
diff --git a/include/elf/or32.h b/include/elf/or32.h
index 14884f3..bc308e7 100644
--- a/include/elf/or32.h
+++ b/include/elf/or32.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 _ELF_OR1K_H
 #define _ELF_OR1K_H
diff --git a/include/elf/pj.h b/include/elf/pj.h
index 586fd3a..45cc7b3 100644
--- a/include/elf/pj.h
+++ b/include/elf/pj.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_PJ_H
 #define _ELF_PJ_H
diff --git a/include/elf/ppc.h b/include/elf/ppc.h
index a41b699..27b28f9 100644
--- a/include/elf/ppc.h
+++ b/include/elf/ppc.h
@@ -20,7 +20,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.  */
 
 /* This file holds definitions specific to the PPC ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/ppc64.h b/include/elf/ppc64.h
index ee2b0ea..4aab2ec 100644
--- a/include/elf/ppc64.h
+++ b/include/elf/ppc64.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.  */
 
 #ifndef _ELF_PPC64_H
 #define _ELF_PPC64_H
diff --git a/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
index 4a3a60f..51e86b5 100644
--- a/include/elf/reloc-macros.h
+++ b/include/elf/reloc-macros.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* These macros are used by the various *.h target specific header
    files to either generate an enum containing all the known relocations
diff --git a/include/elf/s390.h b/include/elf/s390.h
index d7db699..c62b110 100644
--- a/include/elf/s390.h
+++ b/include/elf/s390.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 _ELF_390_H
 #define _ELF_390_H
diff --git a/include/elf/sh.h b/include/elf/sh.h
index ae4ac78..deb7a9d 100644
--- a/include/elf/sh.h
+++ b/include/elf/sh.h
@@ -15,7 +15,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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_SH_H
 #define _ELF_SH_H
diff --git a/include/elf/sparc.h b/include/elf/sparc.h
index 8270214..dc20820 100644
--- a/include/elf/sparc.h
+++ b/include/elf/sparc.h
@@ -17,7 +17,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.  */
 
 #ifndef _ELF_SPARC_H
 #define _ELF_SPARC_H
diff --git a/include/elf/v850.h b/include/elf/v850.h
index c5ce366..95dab49 100644
--- a/include/elf/v850.h
+++ b/include/elf/v850.h
@@ -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.  */
 
 /* This file holds definitions specific to the MIPS ELF ABI.  Note
    that most of this is not actually implemented by BFD.  */
diff --git a/include/elf/vax.h b/include/elf/vax.h
index c1b5c2b..8cc5a11 100644
--- a/include/elf/vax.h
+++ b/include/elf/vax.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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_VAX_H
 #define _ELF_VAX_H
diff --git a/include/elf/x86-64.h b/include/elf/x86-64.h
index 775c0e4..ed6f0d9 100644
--- a/include/elf/x86-64.h
+++ b/include/elf/x86-64.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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_X86_64_H
 #define _ELF_X86_64_H
diff --git a/include/elf/xstormy16.h b/include/elf/xstormy16.h
index 6b1e98f..2442b27 100644
--- a/include/elf/xstormy16.h
+++ b/include/elf/xstormy16.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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ELF_XSTORMY16_H
 #define _ELF_XSTORMY16_H
diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h
index 14f9913..0de9741 100644
--- a/include/elf/xtensa.h
+++ b/include/elf/xtensa.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,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* This file holds definitions specific to the Xtensa ELF ABI.  */
diff --git a/include/fibheap.h b/include/fibheap.h
index bfd82da..348c4ae 100644
--- a/include/fibheap.h
+++ b/include/fibheap.h
@@ -16,8 +16,8 @@ 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.  */
 
 /* Fibonacci heaps are somewhat complex, but, there's an article in
    DDJ that explains them pretty well:
diff --git a/include/filenames.h b/include/filenames.h
index ca9e273..6b72fd2 100644
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -21,7 +21,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.  */
 
 #ifndef FILENAMES_H
 #define FILENAMES_H
diff --git a/include/floatformat.h b/include/floatformat.h
index 40911b3..0cbd143 100644
--- a/include/floatformat.h
+++ b/include/floatformat.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.  */
 
 #if !defined (FLOATFORMAT_H)
 #define FLOATFORMAT_H 1
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 37d23ee..5b9953c 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.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 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.  */
 
 #ifndef	_FNMATCH_H
 
diff --git a/include/gdbm.h b/include/gdbm.h
index 3ebc26d..d2a6006 100644
--- a/include/gdbm.h
+++ b/include/gdbm.h
@@ -14,7 +14,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.  */
 
 /* You may contact the author by:
        e-mail:  phil@wwu.edu
diff --git a/include/getopt.h b/include/getopt.h
index a99a229..5421cab 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -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,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _GETOPT_H
diff --git a/include/hashtab.h b/include/hashtab.h
index 6576522..122ff9d 100644
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -14,7 +14,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.  */
 
 /* This package implements basic hash table functionality.  It is possible
    to search for an entry, create an entry and destroy an entry.
diff --git a/include/hp-symtab.h b/include/hp-symtab.h
index 6267d55..361473f 100644
--- a/include/hp-symtab.h
+++ b/include/hp-symtab.h
@@ -18,7 +18,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 HP_SYMTAB_INCLUDED
 #define HP_SYMTAB_INCLUDED
diff --git a/include/ieee.h b/include/ieee.h
index 5abc32b..72fcad4 100644
--- a/include/ieee.h
+++ b/include/ieee.h
@@ -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.
    
    Contributed by Cygnus Support.  */
 
diff --git a/include/libiberty.h b/include/libiberty.h
index 215e832..3f51e41 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -21,8 +21,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 Cygnus Support, 1994.
 
diff --git a/include/md5.h b/include/md5.h
index 4cdad88..655933f 100644
--- a/include/md5.h
+++ b/include/md5.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.  */
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MD5_H
 #define _MD5_H 1
diff --git a/include/nlm/ChangeLog b/include/nlm/ChangeLog
index b3c9529..a4b527d 100644
--- a/include/nlm/ChangeLog
+++ b/include/nlm/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	alpha-ext.h, common.h, external.h, i386-ext.h, internal.h,
+	ppc-ext.h, sparc32-ext.h
+	
 2003-08-07  Alan Modra  <amodra@bigpond.net.au>
 
 	* internal.h (Nlm_Internal_Custom_Header): Replace PTR with void *.
@@ -8,7 +15,7 @@
 	(NLM_CAT4): Update conditions under which this is defined.  Document
 	why CONCAT4 can't be used.
 
-Fri May  6 13:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-05-06  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* external.h (nlmNAME(External_Custom_Header)): Add length,
 	dataOffset, and dataStamp field.
@@ -16,7 +23,7 @@ Fri May  6 13:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 	* internal.h (Nlm_Internal_Custom_Header): Add hdrLength,
 	dataOffset, dataStamp and hdr fields.
 
-Fri Apr 22 11:12:39 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-04-22  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* external.h (struct nlmNAME(external_cygnus_ext_header)): Rename
 	from nlmNAME(external_cygnus_section_header).  Change stamp field
@@ -25,36 +32,36 @@ Fri Apr 22 11:12:39 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 	nlm_internal_cygnus_section_header.  Change stamp field to 8
 	bytes.
 
-Thu Apr 21 11:57:09 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-04-21  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* internal.h (struct nlm_internal_cygnus_section_header): Define.
 	* external.h (struct nlmNAME(external_cygnus_section_header):
 	Define.
 
-Wed Apr 20 14:27:43 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-04-20  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* internal.h (struct nlm_internal_custom_header): Remove
 	debugRecOffset and debugRecLength fields.  Add data field.
 	* external.h (struct nlmNAME(external_custom_header)): Remove
 	debugRecOffset and debugRecLength fields.
 
-Mon Feb  7 08:28:40 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1994-02-07  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* internal.h: Change HOST_64_BIT to BFD_HOST_64_BIT.
 
-Thu Dec  2 14:14:48 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1993-12-02  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* alpha-ext.h: New file describing formats of information in Alpha
 	NetWare files.
 	* common.h: Define some non-external Alpha information.
 
-Wed Nov 17 17:38:58 1993  Sean Eric Fagan  (sef@cygnus.com)
+1993-11-17  Sean Eric Fagan  (sef@cygnus.com)
 
 	* external.h: Don't define external_fixed_header here.
 	* i386-ext.h, sparc32-ext.h: New header files to define
 	external_fixed_header for particular CPU's.
 
-Wed Oct 27 11:45:56 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1993-10-27  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* internal.h (Nlm_Internal_Extended_Header): Added fields
 	sharedDebugRecordOffset and sharedDebugRecordCount.
@@ -63,16 +70,16 @@ Wed Oct 27 11:45:56 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 	* common.h (NLM_SIGNATURE): Do not define (it's different for each
 	backend).
 
-Tue Aug 31 13:24:15 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1993-08-31  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* internal.h: Change length fields of type char to type unsigned
 	char.
 
-Sat Jul 31 02:12:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1993-07-31  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* common.h (NLM_HIBIT, NLM_HEADER_VERSION): Define.
 
-Thu Jul 22 16:09:47 1993  Fred Fish  (fnf@deneb.cygnus.com)
+1993-07-22  Fred Fish  (fnf@deneb.cygnus.com)
 
 	* common.h (NLM_CAT*, NLM_ARCH_SIZE, NLM_TARGET_LONG_SIZE,
 	NLM_TARGET_ADDRESS_SIZE, NLM_NAME, NlmNAME, nlmNAME):  New
@@ -82,7 +89,7 @@ Thu Jul 22 16:09:47 1993  Fred Fish  (fnf@deneb.cygnus.com)
 	* external.h:  Use nlmNAME and NlmNAME macros to derive both
 	32 and 64 bit versions.
 
-Mon Jul 19 22:12:40 1993  Fred Fish  (fnf@deneb.cygnus.com)
+1993-07-20  Fred Fish  (fnf@deneb.cygnus.com)
 
 	* (common.h, external.h, internal.h):  New files for NLM/NetWare
 	support.
diff --git a/include/nlm/alpha-ext.h b/include/nlm/alpha-ext.h
index ae67524..eea56ef 100644
--- a/include/nlm/alpha-ext.h
+++ b/include/nlm/alpha-ext.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.  */
 
 /* An Alpha NLM starts with an instance of this structure.  */
 
diff --git a/include/nlm/common.h b/include/nlm/common.h
index 208f4cf..c6df3fd 100644
--- a/include/nlm/common.h
+++ b/include/nlm/common.h
@@ -17,7 +17,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.  */
 
 
 /* This file is part of NLM support for BFD, and contains the portions
diff --git a/include/nlm/external.h b/include/nlm/external.h
index 12a486f..66003b3 100644
--- a/include/nlm/external.h
+++ b/include/nlm/external.h
@@ -17,7 +17,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.  */
 
 
 /* This file is part of NLM support for BFD, and contains the portions
diff --git a/include/nlm/i386-ext.h b/include/nlm/i386-ext.h
index c738012..ecb1cc2 100644
--- a/include/nlm/i386-ext.h
+++ b/include/nlm/i386-ext.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.  */
 
 /* The external format of the fixed header.  */
 
diff --git a/include/nlm/internal.h b/include/nlm/internal.h
index f61c42d..59f8ff1 100644
--- a/include/nlm/internal.h
+++ b/include/nlm/internal.h
@@ -17,7 +17,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.  */
 
 
 /* This file is part of NLM support for BFD, and contains the portions
diff --git a/include/nlm/ppc-ext.h b/include/nlm/ppc-ext.h
index 0aae107..9f3a974 100644
--- a/include/nlm/ppc-ext.h
+++ b/include/nlm/ppc-ext.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.  */
 
 #ifdef OLDFORMAT
 
diff --git a/include/nlm/sparc32-ext.h b/include/nlm/sparc32-ext.h
index d73b644..79b1cc4 100644
--- a/include/nlm/sparc32-ext.h
+++ b/include/nlm/sparc32-ext.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.  */
 
 /* The external format of the fixed header.  */
 
diff --git a/include/oasys.h b/include/oasys.h
index c8f737a..25672c7 100644
--- a/include/oasys.h
+++ b/include/oasys.h
@@ -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.
    
    Contributed by Cygnus Support.  */
 
diff --git a/include/objalloc.h b/include/objalloc.h
index bb4cbb1..36772d1 100644
--- a/include/objalloc.h
+++ b/include/objalloc.h
@@ -14,8 +14,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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef OBJALLOC_H
 #define OBJALLOC_H
diff --git a/include/obstack.h b/include/obstack.h
index 6e397ce..88c2a26 100644
--- a/include/obstack.h
+++ b/include/obstack.h
@@ -19,7 +19,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,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Summary:
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index bb3763f..91ad24d 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	a29k.h,	alpha.h, arc.h, arm.h, avr.h, cgen.h, convex.h, cris.h,
+	crx.h, d10v.h, d30v.h, dlx.h, h8300.h, hppa.h, i370.h, i386.h,
+	i860.h, i960.h, m68hc11.h, m68k.h, m88k.h, maxq.h, mips.h, mmix.h,
+	mn10200.h, mn10300.h, msp430.h, np1.h, ns32k.h, or32.h, pdp11.h,
+	pj.h, pn.h, ppc.h, pyr.h, s390.h, sparc.h, tic30.h, tic4x.h,
+	tic54x.h, tic80.h, v850.h, vax.h
+
 2005-05-09  Jan Beulich  <jbeulich@novell.com>
 
 	* i386.h (i386_optab): Add ht and hnt.
diff --git a/include/opcode/a29k.h b/include/opcode/a29k.h
index c6c8c37..656a937 100644
--- a/include/opcode/a29k.h
+++ b/include/opcode/a29k.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.  */
 
 struct a29k_opcode {
   /* Name of the instruction.  */
diff --git a/include/opcode/alpha.h b/include/opcode/alpha.h
index efe1626..22c85a1 100644
--- a/include/opcode/alpha.h
+++ b/include/opcode/alpha.h
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 OPCODE_ALPHA_H
 #define OPCODE_ALPHA_H
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index 629979d..8ddcf54 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS or GDB; 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.  */
 
 
 /* List of the various cpu types.
diff --git a/include/opcode/arm.h b/include/opcode/arm.h
index db36665..d98f038 100644
--- a/include/opcode/arm.h
+++ b/include/opcode/arm.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GDB or GAS; see the file COPYING.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* The following bitmasks control CPU extensions:  */
 #define ARM_EXT_V1	 0x00000001	/* All processors (core set).  */
diff --git a/include/opcode/avr.h b/include/opcode/avr.h
index 6e93b73..b7a80b0 100644
--- a/include/opcode/avr.h
+++ b/include/opcode/avr.h
@@ -15,7 +15,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 AVR_ISA_1200  0x0001 /* in the beginning there was ... */
 #define AVR_ISA_LPM   0x0002 /* device has LPM */
diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h
index f944161..efebadb 100644
--- a/include/opcode/cgen.h
+++ b/include/opcode/cgen.h
@@ -17,7 +17,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.  */
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef CGEN_H
 #define CGEN_H
diff --git a/include/opcode/convex.h b/include/opcode/convex.h
index ccf5568..7843dce 100644
--- a/include/opcode/convex.h
+++ b/include/opcode/convex.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 xxx 0
 #define rrr 1
diff --git a/include/opcode/cris.h b/include/opcode/cris.h
index 9b33f19..81590ba 100644
--- a/include/opcode/cris.h
+++ b/include/opcode/cris.h
@@ -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.  */
 
 #ifndef __CRIS_H_INCLUDED_
 #define __CRIS_H_INCLUDED_
diff --git a/include/opcode/crx.h b/include/opcode/crx.h
index f0fd41a..66def6b 100644
--- a/include/opcode/crx.h
+++ b/include/opcode/crx.h
@@ -18,7 +18,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 _CRX_H_
 #define _CRX_H_
diff --git a/include/opcode/d10v.h b/include/opcode/d10v.h
index 74d9006..c96ddeb 100644
--- a/include/opcode/d10v.h
+++ b/include/opcode/d10v.h
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 D10V_H
 #define D10V_H
diff --git a/include/opcode/d30v.h b/include/opcode/d30v.h
index 809bdeb..7aa5bb6 100644
--- a/include/opcode/d30v.h
+++ b/include/opcode/d30v.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 D30V_H
 #define D30V_H
diff --git a/include/opcode/dlx.h b/include/opcode/dlx.h
index e1b249f..278e936 100644
--- a/include/opcode/dlx.h
+++ b/include/opcode/dlx.h
@@ -15,7 +15,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.
 
    Initially created by Kuang Hwa Lin, 2002.   */
 
diff --git a/include/opcode/h8300.h b/include/opcode/h8300.h
index 2bc7b44..10fdf52 100644
--- a/include/opcode/h8300.h
+++ b/include/opcode/h8300.h
@@ -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.  */
 
 /* Instructions are stored as a sequence of nibbles.
    If the nibble has value 15 or less than the representation is complete.
diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h
index 312cb7f..faf4632 100644
--- a/include/opcode/hppa.h
+++ b/include/opcode/hppa.h
@@ -20,7 +20,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GAS or GDB; 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.  */
 
 #if !defined(__STDC__) && !defined(const)
 #define const
diff --git a/include/opcode/i370.h b/include/opcode/i370.h
index e317f23..bdbb2f4 100644
--- a/include/opcode/i370.h
+++ b/include/opcode/i370.h
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 I370_H
 #define I370_H
diff --git a/include/opcode/i386.h b/include/opcode/i386.h
index 2b8c8b5..df1131d 100644
--- a/include/opcode/i386.h
+++ b/include/opcode/i386.h
@@ -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.  */
 
 /* The SystemV/386 SVR3.2 assembler, and probably all AT&T derived
    ix86 Unix assemblers, generate floating point instructions with
diff --git a/include/opcode/i860.h b/include/opcode/i860.h
index fe08ee4..7836bff 100644
--- a/include/opcode/i860.h
+++ b/include/opcode/i860.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 GAS or GDB; 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.  */
 
 
 /* Structure of an opcode table entry.  */
diff --git a/include/opcode/i960.h b/include/opcode/i960.h
index 33b56e6..0999aa1 100644
--- a/include/opcode/i960.h
+++ b/include/opcode/i960.h
@@ -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.
  
   The 'COJ' instructions are actually COBR instructions with the 'b' in
   the mnemonic replaced by a 'j';  they are ALWAYS "de-optimized" if necessary:
diff --git a/include/opcode/m68hc11.h b/include/opcode/m68hc11.h
index 648c23b..cddc59a 100644
--- a/include/opcode/m68hc11.h
+++ b/include/opcode/m68hc11.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 _OPCODE_M68HC11_H
 #define _OPCODE_M68HC11_H
diff --git a/include/opcode/m68k.h b/include/opcode/m68k.h
index 014495b..84bef98 100644
--- a/include/opcode/m68k.h
+++ b/include/opcode/m68k.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this file; 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.  */
 
 /* These are used as bit flags for the arch field in the m68k_opcode
    structure.  */
diff --git a/include/opcode/m88k.h b/include/opcode/m88k.h
index 0b0666d..2589686 100644
--- a/include/opcode/m88k.h
+++ b/include/opcode/m88k.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.  */
 
 /*
  *			Disassembler Instruction Table
diff --git a/include/opcode/maxq.h b/include/opcode/maxq.h
index f4fcb30..f621ac1 100644
--- a/include/opcode/maxq.h
+++ b/include/opcode/maxq.h
@@ -19,7 +19,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this file; 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.  */
 
 #ifndef _MAXQ20_H_
 #define  _MAXQ20_H_
diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index a71ca47..44b9a15 100644
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -19,7 +19,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 _MIPS_H_
 #define _MIPS_H_
diff --git a/include/opcode/mmix.h b/include/opcode/mmix.h
index d2aef32..7f561c6 100644
--- a/include/opcode/mmix.h
+++ b/include/opcode/mmix.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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.  */
 
 /* We could have just a char*[] table indexed by the register number, but
    that would not allow for synonyms.  The table is terminated with an
diff --git a/include/opcode/mn10200.h b/include/opcode/mn10200.h
index 42fa94b..51e44c6 100644
--- a/include/opcode/mn10200.h
+++ b/include/opcode/mn10200.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 MN10200_H
 #define MN10200_H
diff --git a/include/opcode/mn10300.h b/include/opcode/mn10300.h
index a2e7784..a47ef48 100644
--- a/include/opcode/mn10300.h
+++ b/include/opcode/mn10300.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 MN10300_H
 #define MN10300_H
diff --git a/include/opcode/msp430.h b/include/opcode/msp430.h
index dc3604c..eec2f1e 100644
--- a/include/opcode/msp430.h
+++ b/include/opcode/msp430.h
@@ -15,7 +15,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 __MSP430_H_
 #define __MSP430_H_
diff --git a/include/opcode/np1.h b/include/opcode/np1.h
index c3f7e29..ebe37f5 100644
--- a/include/opcode/np1.h
+++ b/include/opcode/np1.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 GDB; 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.  */
 
 struct gld_opcode
 {
diff --git a/include/opcode/ns32k.h b/include/opcode/ns32k.h
index 68a0dba..5cb2f97 100644
--- a/include/opcode/ns32k.h
+++ b/include/opcode/ns32k.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 GAS; 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.  */
 
 
 #ifdef SEQUENT_COMPATABILITY
diff --git a/include/opcode/or32.h b/include/opcode/or32.h
index d72b9bd..3412b22 100644
--- a/include/opcode/or32.h
+++ b/include/opcode/or32.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.  */
 
 /* We treat all letters the same in encode/decode routines so
    we need to assign some characteristics to them like signess etc.  */
diff --git a/include/opcode/pdp11.h b/include/opcode/pdp11.h
index 228c221..0f0256b 100644
--- a/include/opcode/pdp11.h
+++ b/include/opcode/pdp11.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 GDB or GAS; 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.  */
 
 /*
  * PDP-11 opcode types.
diff --git a/include/opcode/pj.h b/include/opcode/pj.h
index f9e44db..30201d6 100644
--- a/include/opcode/pj.h
+++ b/include/opcode/pj.h
@@ -14,7 +14,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.  */
 
 
 /* Names used to describe the type of instruction arguments, used by
diff --git a/include/opcode/pn.h b/include/opcode/pn.h
index 8c427a2..f8d474f 100644
--- a/include/opcode/pn.h
+++ b/include/opcode/pn.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 GDB; 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.  */
 
 struct gld_opcode
 {
diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index a21cc30..ef097a0 100644
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 PPC_H
 #define PPC_H
diff --git a/include/opcode/pyr.h b/include/opcode/pyr.h
index d0bed6a..a523dfd 100644
--- a/include/opcode/pyr.h
+++ b/include/opcode/pyr.h
@@ -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.  */
    
 /* pyramid opcode table: wot to do with this
    particular opcode */
diff --git a/include/opcode/s390.h b/include/opcode/s390.h
index 54648f9..ac06555 100644
--- a/include/opcode/s390.h
+++ b/include/opcode/s390.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 S390_H
 #define S390_H
diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index c336493..e1edbb3 100644
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.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 GAS or GDB; 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.  */
 
 #include "ansidecl.h"
 
diff --git a/include/opcode/tic30.h b/include/opcode/tic30.h
index a700275..198e04e 100644
--- a/include/opcode/tic30.h
+++ b/include/opcode/tic30.h
@@ -16,8 +16,8 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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.  */
 
 /* FIXME: The opcode table should be in opcodes/tic30-opc.c, not in a
    header file.  */
diff --git a/include/opcode/tic4x.h b/include/opcode/tic4x.h
index 0e6af64..8830a7d 100644
--- a/include/opcode/tic4x.h
+++ b/include/opcode/tic4x.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.
 */
 
 #define IS_CPU_TIC3X(v) ((v) == 30 || (v) == 31 || (v) == 32 || (v) == 33)
diff --git a/include/opcode/tic54x.h b/include/opcode/tic54x.h
index a7958dc..a37ae33 100644
--- a/include/opcode/tic54x.h
+++ b/include/opcode/tic54x.h
@@ -16,8 +16,8 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 _opcode_tic54x_h_
 #define _opcode_tic54x_h_
diff --git a/include/opcode/tic80.h b/include/opcode/tic80.h
index c6a79df..c89b81c 100644
--- a/include/opcode/tic80.h
+++ b/include/opcode/tic80.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 TIC80_H
 #define TIC80_H
diff --git a/include/opcode/v850.h b/include/opcode/v850.h
index 75689bf..436ff39 100644
--- a/include/opcode/v850.h
+++ b/include/opcode/v850.h
@@ -16,7 +16,7 @@ the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this file; 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 V850_H
 #define V850_H
diff --git a/include/opcode/vax.h b/include/opcode/vax.h
index 6fda6b2..a521303 100644
--- a/include/opcode/vax.h
+++ b/include/opcode/vax.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 GDB or GAS; 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.  */
 
 #ifndef vax_opcodeT
 #define vax_opcodeT int
diff --git a/include/os9k.h b/include/os9k.h
index 596f56d..e8baee1 100644
--- a/include/os9k.h
+++ b/include/os9k.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 GNU CC; 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.  */
 
 #if !defined(_MODULE_H)
 #define _MODULE_H
diff --git a/include/partition.h b/include/partition.h
index 0cf3fbc..d8b554f 100644
--- a/include/partition.h
+++ b/include/partition.h
@@ -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 package implements a partition of consecutive integers.  The
    elements are partitioned into classes.  Each class is represented
diff --git a/include/progress.h b/include/progress.h
index 23b0960..53e0199 100644
--- a/include/progress.h
+++ b/include/progress.h
@@ -13,7 +13,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.  */
 
 /* The default definitions below are intended to be replaced by real
    definitions, if building the tools for an interactive programming
diff --git a/include/safe-ctype.h b/include/safe-ctype.h
index 69a3f74..e59b357 100644
--- a/include/safe-ctype.h
+++ b/include/safe-ctype.h
@@ -16,8 +16,8 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This is a compatible replacement of the standard C library's <ctype.h>
    with the following properties:
diff --git a/include/sort.h b/include/sort.h
index 10aafb0..582af81 100644
--- a/include/sort.h
+++ b/include/sort.h
@@ -16,8 +16,8 @@ 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.  */
 
 #ifndef SORT_H
 #define SORT_H
diff --git a/include/splay-tree.h b/include/splay-tree.h
index ca11711..78d8f71 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -16,8 +16,8 @@ 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.  */
 
 /* For an easily readable description of splay-trees, see:
 
diff --git a/include/symcat.h b/include/symcat.h
index 61ce1e9..03a1292 100644
--- a/include/symcat.h
+++ b/include/symcat.h
@@ -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.  */
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef SYM_CAT_H
 #define SYM_CAT_H
diff --git a/include/ternary.h b/include/ternary.h
index b346ac8..31c1fce 100644
--- a/include/ternary.h
+++ b/include/ternary.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,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 #ifndef TERNARY_H_
 #define TERNARY_H_
diff --git a/include/xregex2.h b/include/xregex2.h
index 812518b..358f31e 100644
--- a/include/xregex2.h
+++ b/include/xregex2.h
@@ -16,8 +16,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.  */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/include/xtensa-config.h b/include/xtensa-config.h
index 4ef5d64..7ea676b 100644
--- a/include/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef XTENSA_CONFIG_H
 #define XTENSA_CONFIG_H
diff --git a/include/xtensa-isa-internal.h b/include/xtensa-isa-internal.h
index 7ec2b9e..9ea23e4 100644
--- a/include/xtensa-isa-internal.h
+++ b/include/xtensa-isa-internal.h
@@ -15,7 +15,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 XTENSA_ISA_INTERNAL_H
 #define XTENSA_ISA_INTERNAL_H
diff --git a/include/xtensa-isa.h b/include/xtensa-isa.h
index 043b9cd..6abf205 100644
--- a/include/xtensa-isa.h
+++ b/include/xtensa-isa.h
@@ -15,7 +15,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 XTENSA_LIBISA_H
 #define XTENSA_LIBISA_H