From fad6cb1a565bb73f83fc0e2654489457b489e436 Mon Sep 17 00:00:00 2001
From: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 4 Jan 2009 22:05:52 +0000
Subject: [PATCH] Update FSF address in GPL/LGPL boilerplate

The attached patch updates the FSF address in the GPL/LGPL boilerplate
in most GPL/LGPLed files, and also in COPYING.LIB.

Signed-off-by: Stuart Brady <stuart.brady@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6162 c046a42c-6fe2-441c-8c8c-71466251a162
---
 COPYING.LIB                   |  4 ++--
 alpha-dis.c                   |  4 ++--
 bt-host.c                     |  7 +++----
 bt-vhci.c                     |  7 +++----
 cpu-all.h                     |  2 +-
 cpu-defs.h                    |  2 +-
 cpu-exec.c                    |  2 +-
 darwin-user/machload.c        |  2 +-
 dyngen-exec.h                 |  2 +-
 exec-all.h                    |  2 +-
 exec.c                        |  2 +-
 gdbstub.c                     |  2 +-
 hostregs_helper.h             |  2 +-
 hw/acpi.c                     |  2 +-
 hw/alpha_palcode.c            |  2 +-
 hw/apic.c                     |  2 +-
 hw/blizzard.c                 |  7 +++----
 hw/blizzard_template.h        |  7 +++----
 hw/bt-hci-csr.c               |  7 +++----
 hw/bt-hid.c                   |  7 +++----
 hw/bt-sdp.c                   |  7 +++----
 hw/bt.c                       |  7 +++----
 hw/cbus.c                     |  7 +++----
 hw/e1000.c                    |  2 +-
 hw/fmopl.c                    |  2 +-
 hw/g364fb.c                   |  7 +++----
 hw/g364fb_template.h          |  7 +++----
 hw/hpet.c                     |  2 +-
 hw/lm832x.c                   |  7 +++----
 hw/nseries.c                  |  7 +++----
 hw/omap.h                     |  7 +++----
 hw/omap1.c                    |  7 +++----
 hw/omap2.c                    |  7 +++----
 hw/omap_clk.c                 |  7 +++----
 hw/omap_dma.c                 |  7 +++----
 hw/omap_dss.c                 |  7 +++----
 hw/omap_i2c.c                 |  7 +++----
 hw/omap_lcdc.c                |  7 +++----
 hw/omap_mmc.c                 |  7 +++----
 hw/omap_sx1.c                 |  7 +++----
 hw/onenand.c                  |  7 +++----
 hw/palm.c                     |  7 +++----
 hw/pflash_cfi01.c             |  2 +-
 hw/pflash_cfi02.c             |  2 +-
 hw/soc_dma.c                  |  7 +++----
 hw/soc_dma.h                  |  7 +++----
 hw/tc6393xb_template.h        |  7 +++----
 hw/tmp105.c                   |  7 +++----
 hw/tsc2005.c                  |  7 +++----
 hw/tsc210x.c                  |  7 +++----
 hw/tusb6010.c                 |  7 +++----
 hw/twl92230.c                 |  7 +++----
 hw/usb-bt.c                   |  7 +++----
 hw/usb-musb.c                 |  7 +++----
 hw/usb-ohci.c                 |  2 +-
 hw/zaurus.c                   |  7 +++----
 i386-dis.c                    |  2 +-
 kqemu.c                       |  2 +-
 linux-user/ppc/syscall.h      |  2 +-
 loader.c                      |  7 +++----
 mips-dis.c                    | 27 +++------------------------
 nbd.c                         |  2 +-
 nbd.h                         |  2 +-
 net-checksum.c                |  2 +-
 ppc-dis.c                     |  7 ++++---
 qemu-lock.h                   |  2 +-
 qemu-nbd.c                    |  2 +-
 sh4-dis.c                     |  3 ++-
 softmmu_header.h              |  2 +-
 softmmu_template.h            |  2 +-
 tap-win32.c                   |  2 +-
 target-alpha/cpu.h            |  2 +-
 target-alpha/exec.h           |  2 +-
 target-alpha/helper.c         |  2 +-
 target-alpha/op_helper.c      |  2 +-
 target-alpha/translate.c      |  2 +-
 target-arm/cpu.h              |  2 +-
 target-arm/exec.h             |  2 +-
 target-arm/iwmmxt_helper.c    |  2 +-
 target-arm/op_helper.c        |  2 +-
 target-arm/translate.c        |  2 +-
 target-cris/cpu.h             |  2 +-
 target-cris/crisv32-decode.h  |  2 +-
 target-cris/exec.h            |  2 +-
 target-cris/helper.c          |  2 +-
 target-cris/mmu.c             |  2 +-
 target-cris/op_helper.c       |  2 +-
 target-cris/translate.c       |  2 +-
 target-i386/cpu.h             |  2 +-
 target-i386/exec.h            |  2 +-
 target-i386/helper.c          |  2 +-
 target-i386/helper_template.h |  2 +-
 target-i386/op_helper.c       |  2 +-
 target-i386/ops_sse.h         |  2 +-
 target-i386/ops_sse_header.h  |  2 +-
 target-i386/translate.c       |  2 +-
 target-m68k/cpu.h             |  2 +-
 target-m68k/exec.h            |  2 +-
 target-m68k/helper.c          |  2 +-
 target-m68k/op_helper.c       |  2 +-
 target-m68k/translate.c       |  2 +-
 target-mips/helper.c          |  2 +-
 target-mips/op_helper.c       |  2 +-
 target-mips/translate.c       |  2 +-
 target-mips/translate_init.c  |  2 +-
 target-ppc/cpu.h              |  2 +-
 target-ppc/exec.h             |  2 +-
 target-ppc/helper.c           |  2 +-
 target-ppc/helper_regs.h      |  2 +-
 target-ppc/op_helper.c        |  2 +-
 target-ppc/translate.c        |  2 +-
 target-ppc/translate_init.c   |  2 +-
 target-sh4/cpu.h              |  2 +-
 target-sh4/exec.h             |  2 +-
 target-sh4/helper.c           |  2 +-
 target-sh4/op_helper.c        |  2 +-
 target-sh4/translate.c        |  2 +-
 target-sparc/helper.c         |  2 +-
 target-sparc/translate.c      |  2 +-
 thunk.c                       |  2 +-
 thunk.h                       |  2 +-
 translate-all.c               |  2 +-
 uboot_image.h                 |  7 +++----
 123 files changed, 207 insertions(+), 264 deletions(-)

diff --git a/COPYING.LIB b/COPYING.LIB
index 223ede7de3..48afc2efd7 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	51 Franklin St, 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.
 
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/alpha-dis.c b/alpha-dis.c
index c6af1aa75d..ee7bf66df0 100644
--- a/alpha-dis.c
+++ b/alpha-dis.c
@@ -17,8 +17,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.  */
 
 #include <stdio.h>
 #include "dis-asm.h"
diff --git a/bt-host.c b/bt-host.c
index 3c7b270dff..07679f65c2 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/bt-vhci.c b/bt-vhci.c
index 4fa1db45e7..5ab2ab8dbd 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/cpu-all.h b/cpu-all.h
index 648264cff8..cceaefd4b4 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_ALL_H
 #define CPU_ALL_H
diff --git a/cpu-defs.h b/cpu-defs.h
index ed8c001469..b0e3f18cbc 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_DEFS_H
 #define CPU_DEFS_H
diff --git a/cpu-exec.c b/cpu-exec.c
index aaf6114ef2..f574877e6f 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #define CPU_NO_GLOBAL_REGS
diff --git a/darwin-user/machload.c b/darwin-user/machload.c
index 3ba417ed0d..9d7aaf5404 100644
--- a/darwin-user/machload.c
+++ b/darwin-user/machload.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/dyngen-exec.h b/dyngen-exec.h
index cc2502e68e..11e6dea357 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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(__DYNGEN_EXEC_H__)
 #define __DYNGEN_EXEC_H__
diff --git a/exec-all.h b/exec-all.h
index fd96adf0de..4b828c591b 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 _EXEC_ALL_H_
diff --git a/exec.c b/exec.c
index 7b333deaf5..e633b74dc0 100644
--- a/exec.c
+++ b/exec.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #ifdef _WIN32
diff --git a/gdbstub.c b/gdbstub.c
index f7c065c958..6c6a7aa63e 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #include "qemu-common.h"
diff --git a/hostregs_helper.h b/hostregs_helper.h
index 67e45e744d..8ba754102b 100644
--- a/hostregs_helper.h
+++ b/hostregs_helper.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 GCC global register variable extension is used to reserve some
diff --git a/hw/acpi.c b/hw/acpi.c
index dd9100aa4b..92b1ffa6cf 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "hw.h"
 #include "pc.h"
diff --git a/hw/alpha_palcode.c b/hw/alpha_palcode.c
index 351bb4879b..70d4af6b2a 100644
--- a/hw/alpha_palcode.c
+++ b/hw/alpha_palcode.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdint.h>
diff --git a/hw/apic.c b/hw/apic.c
index f6950ca4d4..bad137f826 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "hw.h"
 #include "pc.h"
diff --git a/hw/blizzard.c b/hw/blizzard.c
index 30641f5dcd..eeaacdd3fc 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/blizzard_template.h b/hw/blizzard_template.h
index 1643c2d749..ae51525315 100644
--- a/hw/blizzard_template.h
+++ b/hw/blizzard_template.h
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define SKIP_PIXEL(to)		to += deststep
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 62943ffdac..183441b026 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index 4602d9e06e..815caaf6a1 100644
--- a/hw/bt-hid.c
+++ b/hw/bt-hid.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/bt-sdp.c b/hw/bt-sdp.c
index bb060d1048..9dee7c20a0 100644
--- a/hw/bt-sdp.c
+++ b/hw/bt-sdp.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/bt.c b/hw/bt.c
index a6fcba8b57..3f886b4360 100644
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/cbus.c b/hw/cbus.c
index 03218b4450..ba8afe56c5 100644
--- a/hw/cbus.c
+++ b/hw/cbus.c
@@ -16,10 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/e1000.c b/hw/e1000.c
index c326671b0e..7ca0747040 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 
diff --git a/hw/fmopl.c b/hw/fmopl.c
index 2b0e82b0cc..67a23b6999 100644
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -28,7 +28,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 INLINE		__inline
diff --git a/hw/g364fb.c b/hw/g364fb.c
index 5360bce636..b2aeaabc3a 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/g364fb_template.h b/hw/g364fb_template.h
index 2f10e9d039..49796fa346 100644
--- a/hw/g364fb_template.h
+++ b/hw/g364fb_template.h
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 static void glue(g364fb_draw_graphic, BPP)(G364State *s, int full_update)
diff --git a/hw/hpet.c b/hw/hpet.c
index 6b2cb38429..5c1aca2530 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  *
  * *****************************************************************
  *
diff --git a/hw/lm832x.c b/hw/lm832x.c
index 1e4564e3b8..dd94310f67 100644
--- a/hw/lm832x.c
+++ b/hw/lm832x.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/nseries.c b/hw/nseries.c
index 925e89cf53..d52a5e9efd 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/omap.h b/hw/omap.h
index 51a2021f4f..636c3c3802 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef hw_omap_h
 # define hw_omap_h		"omap.h"
diff --git a/hw/omap1.c b/hw/omap1.c
index 89b6278742..97d2234bcb 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "arm-misc.h"
diff --git a/hw/omap2.c b/hw/omap2.c
index 01b7d52c21..1b745b3e7c 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "arm-misc.h"
diff --git a/hw/omap_clk.c b/hw/omap_clk.c
index 3a681300b8..38b098e56a 100644
--- a/hw/omap_clk.c
+++ b/hw/omap_clk.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "omap.h"
diff --git a/hw/omap_dma.c b/hw/omap_dma.c
index 00d4e6508c..6df38002ae 100644
--- a/hw/omap_dma.c
+++ b/hw/omap_dma.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index 8fcb19ccdf..8b139d7c20 100644
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "console.h"
diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c
index 3b7fa60662..258730b5ae 100644
--- a/hw/omap_i2c.c
+++ b/hw/omap_i2c.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "i2c.h"
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index a27f244a9e..dca647c3db 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "console.h"
diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index df3bd49869..fd557c4c41 100644
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "omap.h"
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index df2b52ea54..9eaa9131b2 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -22,10 +22,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "sysemu.h"
diff --git a/hw/onenand.c b/hw/onenand.c
index 9bf4630c47..510119f350 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/palm.c b/hw/palm.c
index 9bc6eec958..9a0eb385f1 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "audio/audio.h"
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 6f97e9d838..23e695cf33 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 /*
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 5849902807..05fb47ffe3 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 /*
diff --git a/hw/soc_dma.c b/hw/soc_dma.c
index 54804221f3..2967b5223f 100644
--- a/hw/soc_dma.c
+++ b/hw/soc_dma.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 6ce8b9e579..47bc4ea269 100644
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 struct soc_dma_s;
diff --git a/hw/tc6393xb_template.h b/hw/tc6393xb_template.h
index c0c4cde1f6..1247ff6e64 100644
--- a/hw/tc6393xb_template.h
+++ b/hw/tc6393xb_template.h
@@ -17,10 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #if BITS == 8
diff --git a/hw/tmp105.c b/hw/tmp105.c
index aa2bff5609..d6ab2c35b0 100644
--- a/hw/tmp105.c
+++ b/hw/tmp105.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index 293d716cd1..e8d4a85b5a 100644
--- a/hw/tsc2005.c
+++ b/hw/tsc2005.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 2d31c65398..41d374fff2 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/tusb6010.c b/hw/tusb6010.c
index 6f37779135..d6847d012d 100644
--- a/hw/tusb6010.c
+++ b/hw/tusb6010.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
diff --git a/hw/twl92230.c b/hw/twl92230.c
index ddb6a2165c..6b0a0b74f0 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "hw.h"
diff --git a/hw/usb-bt.c b/hw/usb-bt.c
index 30efb45a1c..3c4a586bc0 100644
--- a/hw/usb-bt.c
+++ b/hw/usb-bt.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/hw/usb-musb.c b/hw/usb-musb.c
index 1499b310b7..8e1e6ebfde 100644
--- a/hw/usb-musb.c
+++ b/hw/usb-musb.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Only host-mode and non-DMA accesses are currently supported.
  */
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index 585f3a4635..af95c057f4 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  *
  * TODO:
  *  o Isochronous transfers
diff --git a/hw/zaurus.c b/hw/zaurus.c
index b840dfc03a..8b16c47a41 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -12,10 +12,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "pxa.h"
diff --git a/i386-dis.c b/i386-dis.c
index de95e35bca..20de5674e6 100644
--- a/i386-dis.c
+++ b/i386-dis.c
@@ -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.  */
 
 /*
  * 80386 instruction printer by Pace Willisson (pace@prep.ai.mit.edu)
diff --git a/kqemu.c b/kqemu.c
index 4783aa2a08..e915a83565 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #ifdef _WIN32
diff --git a/linux-user/ppc/syscall.h b/linux-user/ppc/syscall.h
index 2035dfbfdb..a21d61b1d5 100644
--- a/linux-user/ppc/syscall.h
+++ b/linux-user/ppc/syscall.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  */
 
 /* XXX: ABSOLUTELY BUGGY:
diff --git a/loader.c b/loader.c
index cca9d3b7db..cf603cc099 100644
--- a/loader.c
+++ b/loader.c
@@ -38,10 +38,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "qemu-common.h"
diff --git a/mips-dis.c b/mips-dis.c
index 10b0fead4d..500aab90a9 100644
--- a/mips-dis.c
+++ b/mips-dis.c
@@ -18,7 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+MA 02110-1301, USA.  */
 
 #include "dis-asm.h"
 
@@ -42,29 +43,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.  */
-
-/* mips.h.  Mips opcode list for GDB, the GNU debugger.
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-   Contributed by Ralph Campbell and OSF
-   Commented and modified by Ian Lance Taylor, Cygnus Support
-
-This file is part of GDB, GAS, and the GNU binutils.
-
-GDB, GAS, and the GNU binutils are free software; you can redistribute
-them and/or modify them under the terms of the GNU General Public
-License as published by the Free Software Foundation; either version
-1, or (at your option) any later version.
-
-GDB, GAS, and the GNU binutils are distributed in the hope that they
-will be useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with 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 bit masks and shift counts to use to access the various
    fields of an instruction.  To retrieve the X field of an
diff --git a/nbd.c b/nbd.c
index 5b5f7608a7..77b3e16926 100644
--- a/nbd.c
+++ b/nbd.c
@@ -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
  */
 
 #include "nbd.h"
diff --git a/nbd.h b/nbd.h
index ede1e746cb..eb77cce219 100644
--- a/nbd.h
+++ b/nbd.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 NBD_H
diff --git a/net-checksum.c b/net-checksum.c
index a4806558eb..fac0651346 100644
--- a/net-checksum.c
+++ b/net-checksum.c
@@ -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
  */
 
 #include "hw/hw.h"
diff --git a/ppc-dis.c b/ppc-dis.c
index f9ae53e1d1..dc64022784 100644
--- a/ppc-dis.c
+++ b/ppc-dis.c
@@ -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.  */
 #include "dis-asm.h"
 
 /* ppc.h -- Header file for PowerPC opcode table
@@ -37,7 +37,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. */
 
 /* The opcode table is an array of struct powerpc_opcode.  */
 
@@ -273,7 +273,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.  */
 
 /* This file holds the PowerPC opcode table.  The opcode table
    includes almost all of the extended instruction mnemonics.  This
diff --git a/qemu-lock.h b/qemu-lock.h
index f938e19e16..afd2d5f20c 100644
--- a/qemu-lock.h
+++ b/qemu-lock.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  */
 
 /* Locking primitives.  Most of this code should be redundant -
diff --git a/qemu-nbd.c b/qemu-nbd.c
index c466ccecaa..ed64b6b2da 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -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
  */
 
 #include <qemu-common.h>
diff --git a/sh4-dis.c b/sh4-dis.c
index 82bb75d222..eb4245e004 100644
--- a/sh4-dis.c
+++ b/sh4-dis.c
@@ -14,7 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #include <stdio.h>
 #include "dis-asm.h"
diff --git a/softmmu_header.h b/softmmu_header.h
index 9649717407..a1b3808493 100644
--- a/softmmu_header.h
+++ b/softmmu_header.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 DATA_SIZE == 8
 #define SUFFIX q
diff --git a/softmmu_template.h b/softmmu_template.h
index cf9180423c..9f20722d7e 100644
--- a/softmmu_template.h
+++ b/softmmu_template.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 DATA_SIZE (1 << SHIFT)
 
diff --git a/tap-win32.c b/tap-win32.c
index 299b4b3225..02a945e914 100644
--- a/tap-win32.c
+++ b/tap-win32.c
@@ -24,7 +24,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program (see the file COPYING included with this
  *  distribution); 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.
  */
 #include "qemu-common.h"
 #include "net.h"
diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 710a6021fa..a160760f86 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 (__CPU_ALPHA_H__)
diff --git a/target-alpha/exec.h b/target-alpha/exec.h
index bf0c80e237..9ea70305ef 100644
--- a/target-alpha/exec.h
+++ b/target-alpha/exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 (__ALPHA_EXEC_H__)
diff --git a/target-alpha/helper.c b/target-alpha/helper.c
index 5a8955d029..fc68a7e0bd 100644
--- a/target-alpha/helper.c
+++ b/target-alpha/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdint.h>
diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c
index 1d7e3a0a85..4015d4a725 100644
--- a/target-alpha/op_helper.c
+++ b/target-alpha/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include "exec.h"
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 7e8e644212..2524662d26 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdint.h>
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index ab101c9d78..54c2c2e3f8 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_ARM_H
 #define CPU_ARM_H
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 88f08862d6..b70e0cbc2a 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #include "dyngen-exec.h"
diff --git a/target-arm/iwmmxt_helper.c b/target-arm/iwmmxt_helper.c
index 6e801c863d..2e4193ecf9 100644
--- a/target-arm/iwmmxt_helper.c
+++ b/target-arm/iwmmxt_helper.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdlib.h>
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 04828d0288..9e5146444e 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "exec.h"
 #include "helpers.h"
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 2b5e5c8dd5..c36a91f722 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index cf61a3d660..9e4faff300 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_CRIS_H
 #define CPU_CRIS_H
diff --git a/target-cris/crisv32-decode.h b/target-cris/crisv32-decode.h
index 3a515c4a05..a8042ab491 100644
--- a/target-cris/crisv32-decode.h
+++ b/target-cris/crisv32-decode.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  */
 
 /* Convenient binary macros.  */
diff --git a/target-cris/exec.h b/target-cris/exec.h
index e82c04a7f5..d328bf60ab 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "dyngen-exec.h"
 
diff --git a/target-cris/helper.c b/target-cris/helper.c
index 2aa5a8e7d2..6bd7aaf02d 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdio.h>
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 9ae398db6d..334b2b600f 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CONFIG_USER_ONLY
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 541237bb57..5db4575fe5 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <assert.h>
diff --git a/target-cris/translate.c b/target-cris/translate.c
index d4328f0462..6a8c355975 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 /*
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index ce9b3fef8d..78035603bf 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_I386_H
 #define CPU_I386_H
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 4d97a1bc69..284f7b0f3b 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "config.h"
 #include "dyngen-exec.h"
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 9ff76b8ab8..a28ab935a9 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-i386/helper_template.h b/target-i386/helper_template.h
index 1176eb9eea..c1087ac983 100644
--- a/target-i386/helper_template.h
+++ b/target-i386/helper_template.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 DATA_BITS (1 << (3 + SHIFT))
 #define SHIFT_MASK (DATA_BITS - 1)
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 52fee3d43f..6e0e32e75b 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_NO_GLOBAL_REGS
 #include "exec.h"
diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h
index 03623058b7..99d483a287 100644
--- a/target-i386/ops_sse.h
+++ b/target-i386/ops_sse.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 SHIFT == 0
 #define Reg MMXReg
diff --git a/target-i386/ops_sse_header.h b/target-i386/ops_sse_header.h
index 53ca520d3f..03e9b17274 100644
--- a/target-i386/ops_sse_header.h
+++ b/target-i386/ops_sse_header.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 SHIFT == 0
 #define Reg MMXReg
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 3c71c957d2..93f805fb8a 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index bdef9b8378..4f55a6e681 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 CPU_M68K_H
 #define CPU_M68K_H
diff --git a/target-m68k/exec.h b/target-m68k/exec.h
index f67941d22b..9117484598 100644
--- a/target-m68k/exec.h
+++ b/target-m68k/exec.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "dyngen-exec.h"
 
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 045687f639..ce56693467 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdio.h>
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index c198e85540..a339a179c0 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "exec.h"
 #include "helpers.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index bc2fe2b619..0546fca79e 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-mips/helper.c b/target-mips/helper.c
index 283bd4d2e9..0a3b913f19 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 4433fde258..3c994992c7 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdlib.h>
 #include "exec.h"
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 418b9ef5da..7bca5bc91e 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdarg.h>
diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c
index 5041d70b3d..7ec82b0d23 100644
--- a/target-mips/translate_init.c
+++ b/target-mips/translate_init.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  */
 
 /* CPU / CPU family specific config register values. */
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 113bba5451..f7a12da628 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 (__CPU_PPC_H__)
 #define __CPU_PPC_H__
diff --git a/target-ppc/exec.h b/target-ppc/exec.h
index 8db2bfa2ab..d89698c63a 100644
--- a/target-ppc/exec.h
+++ b/target-ppc/exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 (__PPC_H__)
 #define __PPC_H__
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 4676d50d87..a953e1fa76 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h
index 9666d4b6fa..15392393ec 100644
--- a/target-ppc/helper_regs.h
+++ b/target-ppc/helper_regs.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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(__HELPER_REGS_H__)
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index 367c36682d..9566aaf031 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "exec.h"
 #include "host-utils.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index e064bad5c6..f1703bc7bb 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 3f01e66f68..5008a3a602 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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
  */
 
 /* A lot of PowerPC definition have been included here.
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 226417f34c..623eacc0a6 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 _CPU_SH4_H
 #define _CPU_SH4_H
diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index 70297841ab..e74dc9d364 100644
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 _EXEC_SH4_H
 #define _EXEC_SH4_H
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index 882bc9c541..a790aeb030 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index 63522194f7..aa81d9ed4a 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <assert.h>
 #include "exec.h"
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 73134f0aed..ef50f9b53e 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index fb47d45d33..7943e12bf4 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 07b2624b0c..37530e30e2 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdarg.h>
diff --git a/thunk.c b/thunk.c
index 8f3e637b73..6813c9ffa0 100644
--- a/thunk.c
+++ b/thunk.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/thunk.h b/thunk.h
index effc5e2446..597d753c79 100644
--- a/thunk.h
+++ b/thunk.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; 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 THUNK_H
 #define THUNK_H
diff --git a/translate-all.c b/translate-all.c
index 75ef7f33c9..1d1364b816 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/uboot_image.h b/uboot_image.h
index d5a5b30458..b6d49bee2b 100644
--- a/uboot_image.h
+++ b/uboot_image.h
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  ********************************************************************
  * NOTE: This header file defines an interface to U-Boot. Including
-- 
2.30.2