Update the address and phone number of the FSF organization

50 files changed, 64 insertions, 52 deletions

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 3515bc36c..cf848c247 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 4cee1495f..5b5c41164 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 6e94c29db..e2f4f4160 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 81a8de1d7..5e4d03764 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 86905cf09..68b4d9539 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 db92ff6a8..0a11557d7 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 1a91afe0f..de66a496a 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 5af5576c7..8225baa41 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 33ba00514..4893d48d3 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 5bc613bc3..bc32d8e1f 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 5abb06a55..8483a7858 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 562f600f3..eea5b80d6 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 170d60a5f..6f1bca370 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 94589076f..6932489e3 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 e87db932b..a7fc7674a 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 12a450dff..eb2b93795 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 5e6f2204f..f2b10974a 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 1aad7a4ed..1a115add1 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 45e0b9f0f..e745882c7 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 fd5ec4739..27bfdccc8 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 f361edc84..5a4d3306d 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 de34aeb01..9e76dcda7 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 253e43852..b96aae9d3 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 62b971c23..2a9694e95 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 eddf82e94..7e13d54a9 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 c331b720f..83fe1d412 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 56fc0ca4a..012f2538e 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 6441efe27..b82377af0 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 1902f7fa6..1cd460051 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 d6bc54f3d..05e2eb8f3 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 387a57d45..5600df7e8 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 472a7c9d2..540815bfe 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 89778e447..9661e87b5 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 1dfade5cc..8461588e3 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 5ae52f1d8..d241e9c61 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 40ab2e27e..ff16ba2d2 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 c60990624..326834e34 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 14884f330..bc308e751 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 586fd3a36..45cc7b36a 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 a41b6997f..27b28f9b8 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 ee2b0ea53..4aab2ec94 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 4a3a60f7e..51e86b5af 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 d7db6996a..c62b11016 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 ae4ac78fe..deb7a9dc1 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 82702144b..dc20820ec 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 c5ce366b0..95dab49b6 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 c1b5c2b30..8cc5a1193 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 775c0e4d9..ed6f0d93a 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 6b1e98f57..2442b27f4 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 14f991322..0de9741b6 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.  */