diff --git a/COPYING b/COPYING
index fbdd65f6f..f9f93a5d8 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/acinclude.m4 b/acinclude.m4
index 17939c3fe..00d53ad08 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -263,7 +263,7 @@ AH_TOP([
  *
  *  You should have received a copy of the GNU General Public 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-1335, USA.
  */
 ])
 
diff --git a/config.cmake.h b/config.cmake.h
index 61e24160f..cc94a38c6 100644
--- a/config.cmake.h
+++ b/config.cmake.h
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/bios.h b/include/bios.h
index ccb9c763d..c5d31acaa 100644
--- a/include/bios.h
+++ b/include/bios.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/include/bios_disk.h b/include/bios_disk.h
index 368a84eb9..4f37eeea6 100644
--- a/include/bios_disk.h
+++ b/include/bios_disk.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_BIOS_DISK_H
diff --git a/include/callback.h b/include/callback.h
index 971b6280b..8f91dd0dd 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/control.h b/include/control.h
index f7d839a04..7a394e9bd 100644
--- a/include/control.h
+++ b/include/control.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/cpu.h b/include/cpu.h
index b3c36dc36..2245ec1d5 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/cross.h b/include/cross.h
index 864fda05d..32eb1283e 100644
--- a/include/cross.h
+++ b/include/cross.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/debug.h b/include/debug.h
index f2ea6995a..4a4d1017d 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 void DEBUG_SetupConsole(void);
diff --git a/include/dma.h b/include/dma.h
index 63cfe3017..997632e31 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/dos_inc.h b/include/dos_inc.h
index 88937a467..f98020c22 100644
--- a/include/dos_inc.h
+++ b/include/dos_inc.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/dos_system.h b/include/dos_system.h
index c2fe046a1..f463b7032 100644
--- a/include/dos_system.h
+++ b/include/dos_system.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/dosbox.h b/include/dosbox.h
index 26ab75080..0e50497fb 100644
--- a/include/dosbox.h
+++ b/include/dosbox.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/fpu.h b/include/fpu.h
index 763f7eb2f..425db628e 100644
--- a/include/fpu.h
+++ b/include/fpu.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_FPU_H
diff --git a/include/fpu_control_x86.h b/include/fpu_control_x86.h
index 4fe184700..40d4a53c3 100644
--- a/include/fpu_control_x86.h
+++ b/include/fpu_control_x86.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1335 USA.  */
 
 #ifndef _FPU_CONTROL_H
 #define _FPU_CONTROL_H	1
diff --git a/include/hardware.h b/include/hardware.h
index 73e2ba794..08550e2ea 100644
--- a/include/hardware.h
+++ b/include/hardware.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/inout.h b/include/inout.h
index fc65b0e9b..56d07fc5b 100644
--- a/include/inout.h
+++ b/include/inout.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/ipx.h b/include/ipx.h
index afd8e7d73..4c99381f8 100644
--- a/include/ipx.h
+++ b/include/ipx.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/ipxserver.h b/include/ipxserver.h
index 1d4487558..54f0aa29b 100644
--- a/include/ipxserver.h
+++ b/include/ipxserver.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_IPXSERVER_H_
diff --git a/include/joystick.h b/include/joystick.h
index 812bc0e5c..af7d0c2a1 100644
--- a/include/joystick.h
+++ b/include/joystick.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_JOYSTICK_H
diff --git a/include/keyboard.h b/include/keyboard.h
index 3728b4e36..1c46abf4f 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_KEYBOARD_H
diff --git a/include/logging.h b/include/logging.h
index 7f0be4f79..7936b38bf 100644
--- a/include/logging.h
+++ b/include/logging.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_LOGGING_H
diff --git a/include/mapper.h b/include/mapper.h
index 6eb7deaa7..e6890988c 100644
--- a/include/mapper.h
+++ b/include/mapper.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_MAPPER_H
diff --git a/include/mem.h b/include/mem.h
index b8b686400..f400b63d7 100644
--- a/include/mem.h
+++ b/include/mem.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_MEM_H
diff --git a/include/menu.h b/include/menu.h
index d012afbf6..3eecda79b 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <string>
diff --git a/include/menudef.h b/include/menudef.h
index 698553fed..6c8adf929 100644
--- a/include/menudef.h
+++ b/include/menudef.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifdef __WIN32__
diff --git a/include/midi.h b/include/midi.h
index adc0f2e32..318adc2c3 100644
--- a/include/midi.h
+++ b/include/midi.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/mixer.h b/include/mixer.h
index 76626d900..95a355402 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/mmx.h b/include/mmx.h
index ea1da426b..adc6fa3bc 100644
--- a/include/mmx.h
+++ b/include/mmx.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_MMX_H
diff --git a/include/mouse.h b/include/mouse.h
index 4a87e9a7b..89e74a69a 100644
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/ne2000.h b/include/ne2000.h
index 4544daf19..a2e79bc12 100644
--- a/include/ne2000.h
+++ b/include/ne2000.h
@@ -22,7 +22,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-1335 USA USA
 
 // Peter Grehan (grehan@iprg.nokia.com) coded all of this
 // NE2000/ether stuff.
diff --git a/include/paging.h b/include/paging.h
index 9a6b9f5d3..f27a08f3e 100644
--- a/include/paging.h
+++ b/include/paging.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/parport.h b/include/parport.h
index 434f58ce4..6f6b68ed6 100644
--- a/include/parport.h
+++ b/include/parport.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_PARPORT_H
diff --git a/include/pci_bus.h b/include/pci_bus.h
index 1ff804861..8e4e431fd 100644
--- a/include/pci_bus.h
+++ b/include/pci_bus.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_PCI_H
diff --git a/include/pic.h b/include/pic.h
index e606351e2..b16cb0891 100644
--- a/include/pic.h
+++ b/include/pic.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_PIC_H
diff --git a/include/programs.h b/include/programs.h
index 8901021da..47c280028 100644
--- a/include/programs.h
+++ b/include/programs.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/qcow2_disk.h b/include/qcow2_disk.h
index 8b29deac3..eea2d9e30 100644
--- a/include/qcow2_disk.h
+++ b/include/qcow2_disk.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/regs.h b/include/regs.h
index bacbdd246..02a97b803 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_REGS_H
diff --git a/include/render.h b/include/render.h
index 2edbf3b58..b2e4bd288 100644
--- a/include/render.h
+++ b/include/render.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_RENDER_H
diff --git a/include/serialport.h b/include/serialport.h
index be113f0af..ed8ddc191 100644
--- a/include/serialport.h
+++ b/include/serialport.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/setup.h b/include/setup.h
index a8f182775..25b89f4d0 100644
--- a/include/setup.h
+++ b/include/setup.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/shell.h b/include/shell.h
index 4b644d291..449a4a7a7 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/support.h b/include/support.h
index 288912f05..2d2c6511c 100644
--- a/include/support.h
+++ b/include/support.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/timer.h b/include/timer.h
index 6aac7a0f7..49739e45d 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_TIMER_H
diff --git a/include/vga.h b/include/vga.h
index 6b89e4a00..25263f540 100644
--- a/include/vga.h
+++ b/include/vga.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/video.h b/include/video.h
index f661d7cd0..ab9d6f7c9 100644
--- a/include/video.h
+++ b/include/video.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/include/voodoo.h b/include/voodoo.h
index 0c44f9434..47dc2fa4e 100644
--- a/include/voodoo.h
+++ b/include/voodoo.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/ref-static-makefiles/make_em/config.h b/ref-static-makefiles/make_em/config.h
index 090a3dc8c..6ed744341 100644
--- a/ref-static-makefiles/make_em/config.h
+++ b/ref-static-makefiles/make_em/config.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-1335, USA.
  */
 
 
diff --git a/ref-static-makefiles/make_mgw/config.h b/ref-static-makefiles/make_mgw/config.h
index 3b12fb924..78b49ce76 100644
--- a/ref-static-makefiles/make_mgw/config.h
+++ b/ref-static-makefiles/make_mgw/config.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-1335, USA.
  */
 
 
diff --git a/shaders/2xSaI.fx b/shaders/2xSaI.fx
index 3382c34c7..8b024cb93 100644
--- a/shaders/2xSaI.fx
+++ b/shaders/2xSaI.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/2xSaI_sRGB.fx b/shaders/2xSaI_sRGB.fx
index 0e5b0e0ef..846f3ab95 100644
--- a/shaders/2xSaI_sRGB.fx
+++ b/shaders/2xSaI_sRGB.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/2xSaL.fx b/shaders/2xSaL.fx
index a310800db..60c7e16bb 100644
--- a/shaders/2xSaL.fx
+++ b/shaders/2xSaL.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/2xSaL2xAA.fx b/shaders/2xSaL2xAA.fx
index 150f018db..9fd411c93 100644
--- a/shaders/2xSaL2xAA.fx
+++ b/shaders/2xSaL2xAA.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/2xSaLAA.fx b/shaders/2xSaLAA.fx
index 8af6eead1..4b5b14de2 100644
--- a/shaders/2xSaLAA.fx
+++ b/shaders/2xSaLAA.fx
@@ -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-1335, USA.
   
    ############################################################################################*/
  
diff --git a/shaders/2xSaL_Ls.fx b/shaders/2xSaL_Ls.fx
index a310800db..60c7e16bb 100644
--- a/shaders/2xSaL_Ls.fx
+++ b/shaders/2xSaL_Ls.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/4xSaL.fx b/shaders/4xSaL.fx
index 3817c921d..076f0173b 100644
--- a/shaders/4xSaL.fx
+++ b/shaders/4xSaL.fx
@@ -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-1335, USA.
   
    ############################################################################################*/
  
diff --git a/shaders/4xSoft.fx b/shaders/4xSoft.fx
index 53a465395..148851bb2 100644
--- a/shaders/4xSoft.fx
+++ b/shaders/4xSoft.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/4xSoft_PS3.0.fx b/shaders/4xSoft_PS3.0.fx
index b434c9947..7a0e459b7 100644
--- a/shaders/4xSoft_PS3.0.fx
+++ b/shaders/4xSoft_PS3.0.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/5xBR-v3.5b.fx b/shaders/5xBR-v3.5b.fx
index 0a445bd91..921301ba8 100644
--- a/shaders/5xBR-v3.5b.fx
+++ b/shaders/5xBR-v3.5b.fx
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 
 */
 
diff --git a/shaders/5xBR-v3.8a.fx b/shaders/5xBR-v3.8a.fx
index bf61009aa..b78e9a72e 100644
--- a/shaders/5xBR-v3.8a.fx
+++ b/shaders/5xBR-v3.8a.fx
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 
 */
 
diff --git a/shaders/5xBR-v3.8b.fx b/shaders/5xBR-v3.8b.fx
index 75e1ce55a..a0dfb825c 100644
--- a/shaders/5xBR-v3.8b.fx
+++ b/shaders/5xBR-v3.8b.fx
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 
 */
 
diff --git a/shaders/5xBR-v3.8c.fx b/shaders/5xBR-v3.8c.fx
index f25adbb08..a61eeeffe 100644
--- a/shaders/5xBR-v3.8c.fx
+++ b/shaders/5xBR-v3.8c.fx
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 
 */
 
diff --git a/shaders/AdvancedAA.fx b/shaders/AdvancedAA.fx
index dc7ffa4d4..05d779780 100644
--- a/shaders/AdvancedAA.fx
+++ b/shaders/AdvancedAA.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/Cartoon.fx b/shaders/Cartoon.fx
index 2094d2722..2ee8d7dc4 100644
--- a/shaders/Cartoon.fx
+++ b/shaders/Cartoon.fx
@@ -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-1335, USA.
   
    ############################################################################################*/
  
diff --git a/shaders/ColorSketch.fx b/shaders/ColorSketch.fx
index 6281cf856..62ad74b7a 100644
--- a/shaders/ColorSketch.fx
+++ b/shaders/ColorSketch.fx
@@ -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-1335, USA.
   
    ############################################################################################*/
  
diff --git a/shaders/GS2x.fx b/shaders/GS2x.fx
index ef42e5fd6..8b0957fb2 100644
--- a/shaders/GS2x.fx
+++ b/shaders/GS2x.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS2xFilter.fx b/shaders/GS2xFilter.fx
index a8cac27f5..0d2a08c3b 100644
--- a/shaders/GS2xFilter.fx
+++ b/shaders/GS2xFilter.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS2xSuper.fx b/shaders/GS2xSuper.fx
index 0c7542ab0..9b9c98db9 100644
--- a/shaders/GS2xSuper.fx
+++ b/shaders/GS2xSuper.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS2xTwo.fx b/shaders/GS2xTwo.fx
index 42aca870b..abc4947e2 100644
--- a/shaders/GS2xTwo.fx
+++ b/shaders/GS2xTwo.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4x.fx b/shaders/GS4x.fx
index c2d18c983..e7fc5eab5 100644
--- a/shaders/GS4x.fx
+++ b/shaders/GS4x.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4xColorScale.fx b/shaders/GS4xColorScale.fx
index 7fd273c39..f19259370 100644
--- a/shaders/GS4xColorScale.fx
+++ b/shaders/GS4xColorScale.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4xFilter.fx b/shaders/GS4xFilter.fx
index debfef5dd..a28cfe5df 100644
--- a/shaders/GS4xFilter.fx
+++ b/shaders/GS4xFilter.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4xHqFilter.fx b/shaders/GS4xHqFilter.fx
index 46f946ff0..ce50c8494 100644
--- a/shaders/GS4xHqFilter.fx
+++ b/shaders/GS4xHqFilter.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4xScale.fx b/shaders/GS4xScale.fx
index fd05856f0..8740644b5 100644
--- a/shaders/GS4xScale.fx
+++ b/shaders/GS4xScale.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/GS4xSoft.fx b/shaders/GS4xSoft.fx
index 092cd64c3..faaa709ec 100644
--- a/shaders/GS4xSoft.fx
+++ b/shaders/GS4xSoft.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/Gs2xLS.fx b/shaders/Gs2xLS.fx
index ef42e5fd6..8b0957fb2 100644
--- a/shaders/Gs2xLS.fx
+++ b/shaders/Gs2xLS.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/Gs2xSmartFilter.fx b/shaders/Gs2xSmartFilter.fx
index 97e96232c..a87ebb75a 100644
--- a/shaders/Gs2xSmartFilter.fx
+++ b/shaders/Gs2xSmartFilter.fx
@@ -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-1335, USA.
 
    ############################################################################################*/
 
diff --git a/shaders/HQ2x.fx b/shaders/HQ2x.fx
index 073cb6e86..7ed720252 100644
--- a/shaders/HQ2x.fx
+++ b/shaders/HQ2x.fx
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include "scaling.inc"
diff --git a/shaders/Lanczos.fx b/shaders/Lanczos.fx
index 13f7da000..fb7c43df0 100644
--- a/shaders/Lanczos.fx
+++ b/shaders/Lanczos.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/Lanczos12.fx b/shaders/Lanczos12.fx
index 63b238c11..11f61286b 100644
--- a/shaders/Lanczos12.fx
+++ b/shaders/Lanczos12.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/Lanczos16.fx b/shaders/Lanczos16.fx
index 41f57b368..f05acb710 100644
--- a/shaders/Lanczos16.fx
+++ b/shaders/Lanczos16.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/MCAmber.fx b/shaders/MCAmber.fx
index 6aabc4c56..32e82d7fc 100644
--- a/shaders/MCAmber.fx
+++ b/shaders/MCAmber.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/MCGreen.fx b/shaders/MCGreen.fx
index ede6ba020..952bb45a5 100644
--- a/shaders/MCGreen.fx
+++ b/shaders/MCGreen.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/MCHerc.fx b/shaders/MCHerc.fx
index 297aeab75..13bc4c74c 100644
--- a/shaders/MCHerc.fx
+++ b/shaders/MCHerc.fx
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 
 */
 
diff --git a/shaders/MCOrange.fx b/shaders/MCOrange.fx
index f24af85dc..62eaa5f00 100644
--- a/shaders/MCOrange.fx
+++ b/shaders/MCOrange.fx
@@ -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-1335, USA.
 */
 
 /*
diff --git a/shaders/Matrix.fx b/shaders/Matrix.fx
index f76107927..fd041dd9f 100644
--- a/shaders/Matrix.fx
+++ b/shaders/Matrix.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/SimpleAA.fx b/shaders/SimpleAA.fx
index 2b365e635..2e9aa9143 100644
--- a/shaders/SimpleAA.fx
+++ b/shaders/SimpleAA.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/Sketch.fx b/shaders/Sketch.fx
index b346a5a04..f6459cd46 100644
--- a/shaders/Sketch.fx
+++ b/shaders/Sketch.fx
@@ -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-1335, USA.
 
 */
 
diff --git a/shaders/Tv.fx b/shaders/Tv.fx
index 3270e9b84..aee9e73cf 100644
--- a/shaders/Tv.fx
+++ b/shaders/Tv.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/bilinear.fx b/shaders/bilinear.fx
index 92bec2d5b..796d85b2c 100644
--- a/shaders/bilinear.fx
+++ b/shaders/bilinear.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/point.fx b/shaders/point.fx
index 100d58d3f..e9aba4e12 100644
--- a/shaders/point.fx
+++ b/shaders/point.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/scale2x.fx b/shaders/scale2x.fx
index 09ba284b5..db1c18c3b 100644
--- a/shaders/scale2x.fx
+++ b/shaders/scale2x.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/scale2x_ps14.fx b/shaders/scale2x_ps14.fx
index a566e9175..8ef2bc627 100644
--- a/shaders/scale2x_ps14.fx
+++ b/shaders/scale2x_ps14.fx
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/scaling.inc b/shaders/scaling.inc
index ae2952247..d51f6d56e 100644
--- a/shaders/scaling.inc
+++ b/shaders/scaling.inc
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 //
diff --git a/shaders/shader.code b/shaders/shader.code
index fad65688a..5e1d7bd06 100644
--- a/shaders/shader.code
+++ b/shaders/shader.code
@@ -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-1335, USA.
 
 */ 
 
diff --git a/src/aviwriter/avi.h b/src/aviwriter/avi.h
index 4d3924876..cfc09c201 100644
--- a/src/aviwriter/avi.h
+++ b/src/aviwriter/avi.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __VIDEOMGR_UTIL_AVI_H
diff --git a/src/aviwriter/avi_rw_iobuf.cpp b/src/aviwriter/avi_rw_iobuf.cpp
index 6c5df2699..4b791bcb3 100644
--- a/src/aviwriter/avi_rw_iobuf.cpp
+++ b/src/aviwriter/avi_rw_iobuf.cpp
@@ -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-1335, USA.
  */
 
 #include <string.h>
diff --git a/src/aviwriter/avi_rw_iobuf.h b/src/aviwriter/avi_rw_iobuf.h
index 05fe0961f..f260542ad 100644
--- a/src/aviwriter/avi_rw_iobuf.h
+++ b/src/aviwriter/avi_rw_iobuf.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 extern unsigned char*		avi_io_buf;
diff --git a/src/aviwriter/avi_writer.cpp b/src/aviwriter/avi_writer.cpp
index b264e0702..83711c8e6 100644
--- a/src/aviwriter/avi_writer.cpp
+++ b/src/aviwriter/avi_writer.cpp
@@ -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-1335, USA.
  */
 
 /* Shut up! */
diff --git a/src/aviwriter/avi_writer.h b/src/aviwriter/avi_writer.h
index eda29a512..2b0af7dfb 100644
--- a/src/aviwriter/avi_writer.h
+++ b/src/aviwriter/avi_writer.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __ISP_UTILS_AVI_WRITER_H
diff --git a/src/aviwriter/guid.cpp b/src/aviwriter/guid.cpp
index e5c917ad8..6a4fa1e97 100644
--- a/src/aviwriter/guid.cpp
+++ b/src/aviwriter/guid.cpp
@@ -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-1335, USA.
  */
 
 #include <sys/types.h>
diff --git a/src/aviwriter/guid.h b/src/aviwriter/guid.h
index db7eee059..e264df4dd 100644
--- a/src/aviwriter/guid.h
+++ b/src/aviwriter/guid.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __ISP_UTILS_V4_GUID_H
diff --git a/src/aviwriter/ksdataformat.cpp b/src/aviwriter/ksdataformat.cpp
index 3c3897e05..368099ea2 100644
--- a/src/aviwriter/ksdataformat.cpp
+++ b/src/aviwriter/ksdataformat.cpp
@@ -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-1335, USA.
  */
 
 #include "ksdataformat.h"
diff --git a/src/aviwriter/ksdataformat.h b/src/aviwriter/ksdataformat.h
index eb81b3e1b..332c12e47 100644
--- a/src/aviwriter/ksdataformat.h
+++ b/src/aviwriter/ksdataformat.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef _ISP_UTILS_V4_WIN_KSDATAFORMAT_H_H
diff --git a/src/aviwriter/riff.cpp b/src/aviwriter/riff.cpp
index e6bb613c0..fbf3da541 100644
--- a/src/aviwriter/riff.cpp
+++ b/src/aviwriter/riff.cpp
@@ -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-1335, USA.
  */
 
 /* Shut up! */
diff --git a/src/aviwriter/riff.h b/src/aviwriter/riff.h
index 867ad4d60..1c4e4f721 100644
--- a/src/aviwriter/riff.h
+++ b/src/aviwriter/riff.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __VIDEOMGRUTIL_RIFF_H
diff --git a/src/aviwriter/riff_wav_writer.cpp b/src/aviwriter/riff_wav_writer.cpp
index 7124b6879..e963cfc60 100644
--- a/src/aviwriter/riff_wav_writer.cpp
+++ b/src/aviwriter/riff_wav_writer.cpp
@@ -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-1335, USA.
  */
 
 /* Shut up! */
diff --git a/src/aviwriter/riff_wav_writer.h b/src/aviwriter/riff_wav_writer.h
index ed025e503..991e0953e 100644
--- a/src/aviwriter/riff_wav_writer.h
+++ b/src/aviwriter/riff_wav_writer.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __ISP_UTILS_V4_AVI_RIFF_WAV_WRITER_H
diff --git a/src/cpu/callback.cpp b/src/cpu/callback.cpp
index ed80d1fe1..95c647673 100644
--- a/src/cpu/callback.cpp
+++ b/src/cpu/callback.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec.cpp b/src/cpu/core_dynrec.cpp
index ae2acbefe..938888cec 100644
--- a/src/cpu/core_dynrec.cpp
+++ b/src/cpu/core_dynrec.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/cache.h b/src/cpu/core_dynrec/cache.h
index 06f1dd326..9768a1729 100644
--- a/src/cpu/core_dynrec/cache.h
+++ b/src/cpu/core_dynrec/cache.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/decoder.h b/src/cpu/core_dynrec/decoder.h
index c34e9a797..bba7847ca 100644
--- a/src/cpu/core_dynrec/decoder.h
+++ b/src/cpu/core_dynrec/decoder.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/decoder_basic.h b/src/cpu/core_dynrec/decoder_basic.h
index 11a9a1e49..353ca7ba6 100644
--- a/src/cpu/core_dynrec/decoder_basic.h
+++ b/src/cpu/core_dynrec/decoder_basic.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/decoder_opcodes.h b/src/cpu/core_dynrec/decoder_opcodes.h
index ca07d863c..ed8478e9b 100644
--- a/src/cpu/core_dynrec/decoder_opcodes.h
+++ b/src/cpu/core_dynrec/decoder_opcodes.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/dyn_fpu.h b/src/cpu/core_dynrec/dyn_fpu.h
index a71450380..57ef1de96 100644
--- a/src/cpu/core_dynrec/dyn_fpu.h
+++ b/src/cpu/core_dynrec/dyn_fpu.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/operators.h b/src/cpu/core_dynrec/operators.h
index 15abb8d57..0b804cff2 100644
--- a/src/cpu/core_dynrec/operators.h
+++ b/src/cpu/core_dynrec/operators.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le-common.h b/src/cpu/core_dynrec/risc_armv4le-common.h
index d014c4fe9..970a4b286 100644
--- a/src/cpu/core_dynrec/risc_armv4le-common.h
+++ b/src/cpu/core_dynrec/risc_armv4le-common.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le-o3.h b/src/cpu/core_dynrec/risc_armv4le-o3.h
index 5eaafcf6a..0eaec9ed6 100644
--- a/src/cpu/core_dynrec/risc_armv4le-o3.h
+++ b/src/cpu/core_dynrec/risc_armv4le-o3.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le-thumb-iw.h b/src/cpu/core_dynrec/risc_armv4le-thumb-iw.h
index 9f24bb905..7ca451cc0 100644
--- a/src/cpu/core_dynrec/risc_armv4le-thumb-iw.h
+++ b/src/cpu/core_dynrec/risc_armv4le-thumb-iw.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le-thumb-niw.h b/src/cpu/core_dynrec/risc_armv4le-thumb-niw.h
index f49ffe6e3..1b01f0b7f 100644
--- a/src/cpu/core_dynrec/risc_armv4le-thumb-niw.h
+++ b/src/cpu/core_dynrec/risc_armv4le-thumb-niw.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le-thumb.h b/src/cpu/core_dynrec/risc_armv4le-thumb.h
index 18e875411..1f29047d7 100644
--- a/src/cpu/core_dynrec/risc_armv4le-thumb.h
+++ b/src/cpu/core_dynrec/risc_armv4le-thumb.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv4le.h b/src/cpu/core_dynrec/risc_armv4le.h
index a93a86522..4dbba9d34 100644
--- a/src/cpu/core_dynrec/risc_armv4le.h
+++ b/src/cpu/core_dynrec/risc_armv4le.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_armv8le.h b/src/cpu/core_dynrec/risc_armv8le.h
index c8b32bd41..ee8cc0934 100644
--- a/src/cpu/core_dynrec/risc_armv8le.h
+++ b/src/cpu/core_dynrec/risc_armv8le.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_mipsel32.h b/src/cpu/core_dynrec/risc_mipsel32.h
index 9aa40efcf..705023441 100644
--- a/src/cpu/core_dynrec/risc_mipsel32.h
+++ b/src/cpu/core_dynrec/risc_mipsel32.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_x64.h b/src/cpu/core_dynrec/risc_x64.h
index 901179358..e8ab2a722 100644
--- a/src/cpu/core_dynrec/risc_x64.h
+++ b/src/cpu/core_dynrec/risc_x64.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_dynrec/risc_x86.h b/src/cpu/core_dynrec/risc_x86.h
index 7dbfdc994..3c97b14e1 100644
--- a/src/cpu/core_dynrec/risc_x86.h
+++ b/src/cpu/core_dynrec/risc_x86.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_full.cpp b/src/cpu/core_full.cpp
index 16f86c61b..3f3433dae 100644
--- a/src/cpu/core_full.cpp
+++ b/src/cpu/core_full.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/cpu/core_full/ea_lookup.h b/src/cpu/core_full/ea_lookup.h
index 912e4c14a..03519cb84 100644
--- a/src/cpu/core_full/ea_lookup.h
+++ b/src/cpu/core_full/ea_lookup.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 {
diff --git a/src/cpu/core_full/load.h b/src/cpu/core_full/load.h
index 810316a53..d56961112 100644
--- a/src/cpu/core_full/load.h
+++ b/src/cpu/core_full/load.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 switch (inst.code.load) {
diff --git a/src/cpu/core_full/loadwrite.h b/src/cpu/core_full/loadwrite.h
index e88153f8f..352066c72 100644
--- a/src/cpu/core_full/loadwrite.h
+++ b/src/cpu/core_full/loadwrite.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #define SaveIP() reg_eip=(Bit32u)(inst.cseip-SegBase(cs));
diff --git a/src/cpu/core_full/op.h b/src/cpu/core_full/op.h
index 46f5714bb..5185c36ac 100644
--- a/src/cpu/core_full/op.h
+++ b/src/cpu/core_full/op.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* Do the actual opcode */
diff --git a/src/cpu/core_full/optable.h b/src/cpu/core_full/optable.h
index 0b09d4c6d..9ac727cc7 100644
--- a/src/cpu/core_full/optable.h
+++ b/src/cpu/core_full/optable.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* Big ass opcode table normal,double, 66 normal, 66 double */
diff --git a/src/cpu/core_full/save.h b/src/cpu/core_full/save.h
index eb4a82f01..7467ecdae 100644
--- a/src/cpu/core_full/save.h
+++ b/src/cpu/core_full/save.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* Write the data from the opcode */
diff --git a/src/cpu/core_full/string.h b/src/cpu/core_full/string.h
index f7d4d6438..c277e9e38 100644
--- a/src/cpu/core_full/string.h
+++ b/src/cpu/core_full/string.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 {
diff --git a/src/cpu/core_full/support.h b/src/cpu/core_full/support.h
index c4d1d8ead..0ba4727bb 100644
--- a/src/cpu/core_full/support.h
+++ b/src/cpu/core_full/support.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 enum {
diff --git a/src/cpu/core_normal.cpp b/src/cpu/core_normal.cpp
index b7c2e1aa1..8d95f1845 100644
--- a/src/cpu/core_normal.cpp
+++ b/src/cpu/core_normal.cpp
@@ -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-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/src/cpu/core_normal/helpers.h b/src/cpu/core_normal/helpers.h
index c381f2968..b691c74ba 100644
--- a/src/cpu/core_normal/helpers.h
+++ b/src/cpu/core_normal/helpers.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_normal/prefix_0f.h b/src/cpu/core_normal/prefix_0f.h
index 28a572510..17c77ccac 100644
--- a/src/cpu/core_normal/prefix_0f.h
+++ b/src/cpu/core_normal/prefix_0f.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 	CASE_0F_W(0x00)												/* GRP 6 Exxx */
diff --git a/src/cpu/core_normal/prefix_0f_mmx.h b/src/cpu/core_normal/prefix_0f_mmx.h
index 09ad94fcc..ff2bec4c7 100644
--- a/src/cpu/core_normal/prefix_0f_mmx.h
+++ b/src/cpu/core_normal/prefix_0f_mmx.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* State Management */
diff --git a/src/cpu/core_normal/prefix_66.h b/src/cpu/core_normal/prefix_66.h
index f492f1f15..eefce6ff8 100644
--- a/src/cpu/core_normal/prefix_66.h
+++ b/src/cpu/core_normal/prefix_66.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 	CASE_D(0x01)												/* ADD Ed,Gd */
diff --git a/src/cpu/core_normal/prefix_66_0f.h b/src/cpu/core_normal/prefix_66_0f.h
index b0a3df558..ce5e82f5a 100644
--- a/src/cpu/core_normal/prefix_66_0f.h
+++ b/src/cpu/core_normal/prefix_66_0f.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 	CASE_0F_D(0x00)												/* GRP 6 Exxx */
diff --git a/src/cpu/core_normal/prefix_none.h b/src/cpu/core_normal/prefix_none.h
index 30b77dd00..30e980cb4 100644
--- a/src/cpu/core_normal/prefix_none.h
+++ b/src/cpu/core_normal/prefix_none.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 	CASE_B(0x00)												/* ADD Eb,Gb */
diff --git a/src/cpu/core_normal/string.h b/src/cpu/core_normal/string.h
index 2b989669a..7e39697ca 100644
--- a/src/cpu/core_normal/string.h
+++ b/src/cpu/core_normal/string.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 enum STRING_OP {
diff --git a/src/cpu/core_normal/support.h b/src/cpu/core_normal/support.h
index e7e97f3fa..5a10d5f19 100644
--- a/src/cpu/core_normal/support.h
+++ b/src/cpu/core_normal/support.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/cpu/core_normal/table_ea.h b/src/cpu/core_normal/table_ea.h
index dafdabea8..ea66af5ac 100644
--- a/src/cpu/core_normal/table_ea.h
+++ b/src/cpu/core_normal/table_ea.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 typedef PhysPt (*EA_LookupHandler)(void);
diff --git a/src/cpu/core_normal/table_ea_8086.h b/src/cpu/core_normal/table_ea_8086.h
index 0f7a38f64..cf061d4b6 100644
--- a/src/cpu/core_normal/table_ea_8086.h
+++ b/src/cpu/core_normal/table_ea_8086.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 typedef PhysPt (*EA_LookupHandler)(void);
diff --git a/src/cpu/core_normal_286.cpp b/src/cpu/core_normal_286.cpp
index 54c5f673d..e2e92017e 100644
--- a/src/cpu/core_normal_286.cpp
+++ b/src/cpu/core_normal_286.cpp
@@ -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-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/src/cpu/core_normal_8086.cpp b/src/cpu/core_normal_8086.cpp
index b9f3356a0..a8c9fc9b6 100644
--- a/src/cpu/core_normal_8086.cpp
+++ b/src/cpu/core_normal_8086.cpp
@@ -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-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/src/cpu/core_prefetch.cpp b/src/cpu/core_prefetch.cpp
index 08273dc29..75244f47b 100644
--- a/src/cpu/core_prefetch.cpp
+++ b/src/cpu/core_prefetch.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/core_prefetch_286.cpp b/src/cpu/core_prefetch_286.cpp
index 3d0bd5ca1..fd73082a3 100644
--- a/src/cpu/core_prefetch_286.cpp
+++ b/src/cpu/core_prefetch_286.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/core_prefetch_8086.cpp b/src/cpu/core_prefetch_8086.cpp
index 60f036078..46d418c03 100644
--- a/src/cpu/core_prefetch_8086.cpp
+++ b/src/cpu/core_prefetch_8086.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/core_simple.cpp b/src/cpu/core_simple.cpp
index 3c0cd52f6..95cd863ee 100644
--- a/src/cpu/core_simple.cpp
+++ b/src/cpu/core_simple.cpp
@@ -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-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
index 942745dc9..49d22ea07 100644
--- a/src/cpu/cpu.cpp
+++ b/src/cpu/cpu.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/flags.cpp b/src/cpu/flags.cpp
index e91d51fd7..f12befbad 100644
--- a/src/cpu/flags.cpp
+++ b/src/cpu/flags.cpp
@@ -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-1335, USA.
  */
 
 /*
diff --git a/src/cpu/instructions.h b/src/cpu/instructions.h
index d2d1ff93a..1fc92655e 100644
--- a/src/cpu/instructions.h
+++ b/src/cpu/instructions.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* Jumps */
diff --git a/src/cpu/lazyflags.h b/src/cpu/lazyflags.h
index c5e599f53..38307603f 100644
--- a/src/cpu/lazyflags.h
+++ b/src/cpu/lazyflags.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_LAZYFLAGS_H
diff --git a/src/cpu/mmx.cpp b/src/cpu/mmx.cpp
index 273519fbd..369e09360 100644
--- a/src/cpu/mmx.cpp
+++ b/src/cpu/mmx.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/cpu/modrm.cpp b/src/cpu/modrm.cpp
index dce156af8..5750d5f39 100644
--- a/src/cpu/modrm.cpp
+++ b/src/cpu/modrm.cpp
@@ -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-1335, USA.
  */
 
 #include "cpu.h"
diff --git a/src/cpu/modrm.h b/src/cpu/modrm.h
index f8ea48eeb..e1fb08b5c 100644
--- a/src/cpu/modrm.h
+++ b/src/cpu/modrm.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 extern Bit8u  * lookupRMregb[];
diff --git a/src/cpu/paging.cpp b/src/cpu/paging.cpp
index 009d7a05f..4c1c25f8f 100644
--- a/src/cpu/paging.cpp
+++ b/src/cpu/paging.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp
index 817a9c77e..6e3adf2da 100644
--- a/src/debug/debug.cpp
+++ b/src/debug/debug.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/debug/debug_gui.cpp b/src/debug/debug_gui.cpp
index df03226de..f9aaa5347 100644
--- a/src/debug/debug_gui.cpp
+++ b/src/debug/debug_gui.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/debug/debug_inc.h b/src/debug/debug_inc.h
index 718860875..ff1dcb8e9 100644
--- a/src/debug/debug_inc.h
+++ b/src/debug/debug_inc.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* Local Debug Function */
diff --git a/src/debug/debug_win32.cpp b/src/debug/debug_win32.cpp
index 8c84ae6ed..ce71b2663 100644
--- a/src/debug/debug_win32.cpp
+++ b/src/debug/debug_win32.cpp
@@ -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-1335, USA.
  */
 
 #ifdef WIN32
diff --git a/src/debug/disasm_tables.h b/src/debug/disasm_tables.h
index ad7439382..198bd8dd7 100644
--- a/src/debug/disasm_tables.h
+++ b/src/debug/disasm_tables.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 char * RegTable_16[8]=	{"ax","cx","dx","bx","sp","bp","si","di"};
diff --git a/src/dos/cdrom.cpp b/src/dos/cdrom.cpp
index c0385841d..9d65f61f3 100644
--- a/src/dos/cdrom.cpp
+++ b/src/dos/cdrom.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/cdrom.h b/src/dos/cdrom.h
index 80cfcd04c..9e02f693c 100644
--- a/src/dos/cdrom.h
+++ b/src/dos/cdrom.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/dos/cdrom_aspi_win32.cpp b/src/dos/cdrom_aspi_win32.cpp
index ff5a6d210..d7837554f 100644
--- a/src/dos/cdrom_aspi_win32.cpp
+++ b/src/dos/cdrom_aspi_win32.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/cdrom_image.cpp b/src/dos/cdrom_image.cpp
index c29ca636d..f47815d0e 100644
--- a/src/dos/cdrom_image.cpp
+++ b/src/dos/cdrom_image.cpp
@@ -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-1335, USA.
  */
 
 #include <cctype>
diff --git a/src/dos/cdrom_ioctl_linux.cpp b/src/dos/cdrom_ioctl_linux.cpp
index 60a6ae71c..5e6cdb57d 100644
--- a/src/dos/cdrom_ioctl_linux.cpp
+++ b/src/dos/cdrom_ioctl_linux.cpp
@@ -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-1335, USA.
  */
  
 
diff --git a/src/dos/cdrom_ioctl_os2.cpp b/src/dos/cdrom_ioctl_os2.cpp
index b3df330a3..363df46a6 100644
--- a/src/dos/cdrom_ioctl_os2.cpp
+++ b/src/dos/cdrom_ioctl_os2.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/cdrom_ioctl_win32.cpp b/src/dos/cdrom_ioctl_win32.cpp
index f443cc415..f26b42ba9 100644
--- a/src/dos/cdrom_ioctl_win32.cpp
+++ b/src/dos/cdrom_ioctl_win32.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dev_con.h b/src/dos/dev_con.h
index 168cf23bb..4cbf96eb9 100644
--- a/src/dos/dev_con.h
+++ b/src/dos/dev_con.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/dos/dos.cpp b/src/dos/dos.cpp
index 435d49e12..9e090cd9d 100644
--- a/src/dos/dos.cpp
+++ b/src/dos/dos.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_classes.cpp b/src/dos/dos_classes.cpp
index 41014f83b..e7e328c23 100644
--- a/src/dos/dos_classes.cpp
+++ b/src/dos/dos_classes.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_codepages.h b/src/dos/dos_codepages.h
index 9b69f61c7..ca6d3bf08 100644
--- a/src/dos/dos_codepages.h
+++ b/src/dos/dos_codepages.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/dos/dos_devices.cpp b/src/dos/dos_devices.cpp
index df7eed6a6..d1be23030 100644
--- a/src/dos/dos_devices.cpp
+++ b/src/dos/dos_devices.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_execute.cpp b/src/dos/dos_execute.cpp
index f7a3d19b2..7c274bef5 100644
--- a/src/dos/dos_execute.cpp
+++ b/src/dos/dos_execute.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_files.cpp b/src/dos/dos_files.cpp
index a57e14460..74708644d 100644
--- a/src/dos/dos_files.cpp
+++ b/src/dos/dos_files.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_ioctl.cpp b/src/dos/dos_ioctl.cpp
index 89c50a401..af018c5a8 100644
--- a/src/dos/dos_ioctl.cpp
+++ b/src/dos/dos_ioctl.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_keyboard_layout.cpp b/src/dos/dos_keyboard_layout.cpp
index 5e44bccde..dfd2ce4b5 100644
--- a/src/dos/dos_keyboard_layout.cpp
+++ b/src/dos/dos_keyboard_layout.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_keyboard_layout_data.h b/src/dos/dos_keyboard_layout_data.h
index 8e601115d..34a9cc27e 100644
--- a/src/dos/dos_keyboard_layout_data.h
+++ b/src/dos/dos_keyboard_layout_data.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/dos/dos_memory.cpp b/src/dos/dos_memory.cpp
index 64f2b8784..4dad56ed8 100644
--- a/src/dos/dos_memory.cpp
+++ b/src/dos/dos_memory.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_misc.cpp b/src/dos/dos_misc.cpp
index 3998d84c7..bc4473eed 100644
--- a/src/dos/dos_misc.cpp
+++ b/src/dos/dos_misc.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_mscdex.cpp b/src/dos/dos_mscdex.cpp
index eaca283bb..e9eeb9e88 100644
--- a/src/dos/dos_mscdex.cpp
+++ b/src/dos/dos_mscdex.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp
index 18711c4ca..023434644 100644
--- a/src/dos/dos_programs.cpp
+++ b/src/dos/dos_programs.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/dos_tables.cpp b/src/dos/dos_tables.cpp
index 931d030b3..4582228c6 100644
--- a/src/dos/dos_tables.cpp
+++ b/src/dos/dos_tables.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drive_cache.cpp b/src/dos/drive_cache.cpp
index a2052eca2..566f52107 100644
--- a/src/dos/drive_cache.cpp
+++ b/src/dos/drive_cache.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp
index 1fa571280..2e1ef3817 100644
--- a/src/dos/drive_fat.cpp
+++ b/src/dos/drive_fat.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drive_iso.cpp b/src/dos/drive_iso.cpp
index f7c71b71f..86c5fcec5 100644
--- a/src/dos/drive_iso.cpp
+++ b/src/dos/drive_iso.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp
index 9e1afb060..e7288bd8b 100644
--- a/src/dos/drive_local.cpp
+++ b/src/dos/drive_local.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drive_virtual.cpp b/src/dos/drive_virtual.cpp
index 5b4feabf9..9b06bbaf9 100644
--- a/src/dos/drive_virtual.cpp
+++ b/src/dos/drive_virtual.cpp
@@ -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-1335, USA.
  */
 
 #include <stdio.h>
diff --git a/src/dos/drives.cpp b/src/dos/drives.cpp
index f30f1badc..42a17f056 100644
--- a/src/dos/drives.cpp
+++ b/src/dos/drives.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/dos/drives.h b/src/dos/drives.h
index fdd22c247..1c4a21bb3 100644
--- a/src/dos/drives.h
+++ b/src/dos/drives.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/dosbox.cpp b/src/dosbox.cpp
index 2752fa39e..7ba28704a 100644
--- a/src/dosbox.cpp
+++ b/src/dosbox.cpp
@@ -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-1335, USA.
  */
 
 /* NTS: Valgrind hunting shows memory leak from C++ new operator somewhere
diff --git a/src/fpu/fpu.cpp b/src/fpu/fpu.cpp
index efb95053e..565703822 100644
--- a/src/fpu/fpu.cpp
+++ b/src/fpu/fpu.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/fpu/fpu_instructions.h b/src/fpu/fpu_instructions.h
index e54611010..edc894c31 100644
--- a/src/fpu/fpu_instructions.h
+++ b/src/fpu/fpu_instructions.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <math.h> /* for isinf, etc */
diff --git a/src/fpu/fpu_instructions_longdouble.h b/src/fpu/fpu_instructions_longdouble.h
index f3ded1833..d604086df 100644
--- a/src/fpu/fpu_instructions_longdouble.h
+++ b/src/fpu/fpu_instructions_longdouble.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <math.h> /* for isinf, etc */
diff --git a/src/gui/dosbox_logo.h b/src/gui/dosbox_logo.h
index 7b1e0a4a9..4363422fb 100644
--- a/src/gui/dosbox_logo.h
+++ b/src/gui/dosbox_logo.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 3fdcd4cb8..ae8663e70 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -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-1335, USA.
  */
 
 #include "../dos/drives.h"
diff --git a/src/gui/midi.cpp b/src/gui/midi.cpp
index 6b984e7cd..786a28e56 100644
--- a/src/gui/midi.cpp
+++ b/src/gui/midi.cpp
@@ -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-1335, USA.
  */
 
 #include <assert.h>
diff --git a/src/gui/midi_alsa.h b/src/gui/midi_alsa.h
index 3a0fc9f84..6cdb44ce6 100644
--- a/src/gui/midi_alsa.h
+++ b/src/gui/midi_alsa.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/gui/midi_coreaudio.h b/src/gui/midi_coreaudio.h
index cf0dc0ff4..99113d9b9 100644
--- a/src/gui/midi_coreaudio.h
+++ b/src/gui/midi_coreaudio.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/gui/midi_coremidi.h b/src/gui/midi_coremidi.h
index a2428969d..2d82b1c26 100644
--- a/src/gui/midi_coremidi.h
+++ b/src/gui/midi_coremidi.h
@@ -11,7 +11,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-1335, USA.
  */
 
 #include <CoreMIDI/MIDIServices.h>
diff --git a/src/gui/midi_oss.h b/src/gui/midi_oss.h
index 3b34d24af..a02cfd342 100644
--- a/src/gui/midi_oss.h
+++ b/src/gui/midi_oss.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <fcntl.h>
diff --git a/src/gui/midi_synth.h b/src/gui/midi_synth.h
index df91f97c5..a3a5408e9 100644
--- a/src/gui/midi_synth.h
+++ b/src/gui/midi_synth.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include <fluidsynth.h>
diff --git a/src/gui/midi_win32.h b/src/gui/midi_win32.h
index e04f44669..6e271ee7b 100644
--- a/src/gui/midi_win32.h
+++ b/src/gui/midi_win32.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/gui/render.cpp b/src/gui/render.cpp
index 8513b8b89..9d34c9030 100644
--- a/src/gui/render.cpp
+++ b/src/gui/render.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/gui/render_loops.h b/src/gui/render_loops.h
index c476304a3..5f1d62d34 100644
--- a/src/gui/render_loops.h
+++ b/src/gui/render_loops.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #if defined (SCALERLINEAR)
diff --git a/src/gui/render_scalers.cpp b/src/gui/render_scalers.cpp
index 211529131..4ac07d828 100644
--- a/src/gui/render_scalers.cpp
+++ b/src/gui/render_scalers.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/gui/render_scalers.h b/src/gui/render_scalers.h
index 4b401854b..3210f3638 100644
--- a/src/gui/render_scalers.h
+++ b/src/gui/render_scalers.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef _RENDER_SCALERS_H
diff --git a/src/gui/render_simple.h b/src/gui/render_simple.h
index e1765a882..0efe5fdb5 100644
--- a/src/gui/render_simple.h
+++ b/src/gui/render_simple.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #undef conc4d_func
diff --git a/src/gui/render_templates.h b/src/gui/render_templates.h
index 02af49b18..9c9121900 100644
--- a/src/gui/render_templates.h
+++ b/src/gui/render_templates.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include "config.h"
diff --git a/src/gui/render_templates_hq.h b/src/gui/render_templates_hq.h
index 95a78bc45..c2ef06aea 100644
--- a/src/gui/render_templates_hq.h
+++ b/src/gui/render_templates_hq.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /*
diff --git a/src/gui/render_templates_hq2x.h b/src/gui/render_templates_hq2x.h
index ba7413720..1ce9dd0f4 100644
--- a/src/gui/render_templates_hq2x.h
+++ b/src/gui/render_templates_hq2x.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /*
diff --git a/src/gui/render_templates_hq3x.h b/src/gui/render_templates_hq3x.h
index dab4c8f76..b88e57a57 100644
--- a/src/gui/render_templates_hq3x.h
+++ b/src/gui/render_templates_hq3x.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /*
diff --git a/src/gui/render_templates_sai.h b/src/gui/render_templates_sai.h
index c49c50c76..d8450bcb9 100644
--- a/src/gui/render_templates_sai.h
+++ b/src/gui/render_templates_sai.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 static inline int conc2d(GetResult,SBPP)(PTYPE A, PTYPE B, PTYPE C, PTYPE D) {
diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp
index 537e526e8..0c519fd72 100644
--- a/src/gui/sdl_gui.cpp
+++ b/src/gui/sdl_gui.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
index 0ee5e1aea..5d363a345 100644
--- a/src/gui/sdl_mapper.cpp
+++ b/src/gui/sdl_mapper.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 8d3afb75b..c6a095e02 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -23,7 +23,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-1335, USA.
  */
 
 #ifdef WIN32
diff --git a/src/hardware/adlib.cpp b/src/hardware/adlib.cpp
index 5aee3e670..1aa7a48a5 100644
--- a/src/hardware/adlib.cpp
+++ b/src/hardware/adlib.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/adlib.h b/src/hardware/adlib.h
index cdb5406ba..02cc6d3d8 100644
--- a/src/hardware/adlib.h
+++ b/src/hardware/adlib.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/cmos.cpp b/src/hardware/cmos.cpp
index b4c72621c..e3d62e7e4 100644
--- a/src/hardware/cmos.cpp
+++ b/src/hardware/cmos.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/dbopl.cpp b/src/hardware/dbopl.cpp
index d30c02592..8a59d4226 100644
--- a/src/hardware/dbopl.cpp
+++ b/src/hardware/dbopl.cpp
@@ -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-1335, USA.
  */
 
 /*
diff --git a/src/hardware/dbopl.h b/src/hardware/dbopl.h
index eadd50a78..c00c33df2 100644
--- a/src/hardware/dbopl.h
+++ b/src/hardware/dbopl.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #include "adlib.h"
diff --git a/src/hardware/disney.cpp b/src/hardware/disney.cpp
index e58610040..786a53a6d 100644
--- a/src/hardware/disney.cpp
+++ b/src/hardware/disney.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/dma.cpp b/src/hardware/dma.cpp
index f1fdd742b..2d52de4e6 100644
--- a/src/hardware/dma.cpp
+++ b/src/hardware/dma.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/gameblaster.cpp b/src/hardware/gameblaster.cpp
index 85545a0fc..3bafdb6be 100644
--- a/src/hardware/gameblaster.cpp
+++ b/src/hardware/gameblaster.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/gus.cpp b/src/hardware/gus.cpp
index f861044ed..3985f08fd 100644
--- a/src/hardware/gus.cpp
+++ b/src/hardware/gus.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp
index f2cc92a3c..0c6df997d 100644
--- a/src/hardware/hardware.cpp
+++ b/src/hardware/hardware.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/innova.cpp b/src/hardware/innova.cpp
index 53a9bcec6..72d2a75b8 100644
--- a/src/hardware/innova.cpp
+++ b/src/hardware/innova.cpp
@@ -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-1335, USA.
  */
 
 #include <string.h>
diff --git a/src/hardware/iohandler.cpp b/src/hardware/iohandler.cpp
index 5297311c8..e0ec7b5cd 100644
--- a/src/hardware/iohandler.cpp
+++ b/src/hardware/iohandler.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/ipx.cpp b/src/hardware/ipx.cpp
index 93a165655..cc51ae523 100644
--- a/src/hardware/ipx.cpp
+++ b/src/hardware/ipx.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/ipxserver.cpp b/src/hardware/ipxserver.cpp
index 0a96ef41d..c15ad8203 100644
--- a/src/hardware/ipxserver.cpp
+++ b/src/hardware/ipxserver.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/joystick.cpp b/src/hardware/joystick.cpp
index 47a340624..cf941cac5 100644
--- a/src/hardware/joystick.cpp
+++ b/src/hardware/joystick.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/keyboard.cpp b/src/hardware/keyboard.cpp
index 80e926270..95020bfeb 100644
--- a/src/hardware/keyboard.cpp
+++ b/src/hardware/keyboard.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/memory.cpp b/src/hardware/memory.cpp
index 730a4e7c1..401cc3f9b 100644
--- a/src/hardware/memory.cpp
+++ b/src/hardware/memory.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp
index e3f9bb061..9baa9f2a6 100644
--- a/src/hardware/mixer.cpp
+++ b/src/hardware/mixer.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/mpu401.cpp b/src/hardware/mpu401.cpp
index 150237ba5..2def76a90 100644
--- a/src/hardware/mpu401.cpp
+++ b/src/hardware/mpu401.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/ne2000.cpp b/src/hardware/ne2000.cpp
index 16703ea4e..a716bf3cd 100644
--- a/src/hardware/ne2000.cpp
+++ b/src/hardware/ne2000.cpp
@@ -46,7 +46,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-1335 USA USA
 
 // Peter Grehan (grehan@iprg.nokia.com) coded all of this
 // NE2000/ether stuff.
diff --git a/src/hardware/parport/directlpt_linux.cpp b/src/hardware/parport/directlpt_linux.cpp
index 5e409d767..3f77e796b 100644
--- a/src/hardware/parport/directlpt_linux.cpp
+++ b/src/hardware/parport/directlpt_linux.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/parport/directlpt_linux.h b/src/hardware/parport/directlpt_linux.h
index b6e4d3d33..22805eb6b 100644
--- a/src/hardware/parport/directlpt_linux.h
+++ b/src/hardware/parport/directlpt_linux.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 // include guard
diff --git a/src/hardware/parport/directlpt_win32.cpp b/src/hardware/parport/directlpt_win32.cpp
index 6864fe19e..7488e21c8 100644
--- a/src/hardware/parport/directlpt_win32.cpp
+++ b/src/hardware/parport/directlpt_win32.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/parport/directlpt_win32.h b/src/hardware/parport/directlpt_win32.h
index ee76841bc..87950fea0 100644
--- a/src/hardware/parport/directlpt_win32.h
+++ b/src/hardware/parport/directlpt_win32.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 // include guard
diff --git a/src/hardware/parport/filelpt.cpp b/src/hardware/parport/filelpt.cpp
index 5de6266fe..cd8b6fba1 100644
--- a/src/hardware/parport/filelpt.cpp
+++ b/src/hardware/parport/filelpt.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/parport/filelpt.h b/src/hardware/parport/filelpt.h
index 9a79a800e..f6a27c8cb 100644
--- a/src/hardware/parport/filelpt.h
+++ b/src/hardware/parport/filelpt.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 // include guard
diff --git a/src/hardware/parport/parport.cpp b/src/hardware/parport/parport.cpp
index dcfd9b367..c93da71c0 100644
--- a/src/hardware/parport/parport.cpp
+++ b/src/hardware/parport/parport.cpp
@@ -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-1335, USA.
  */
 /* FIXME: At some point I would like to roll the Disney Sound Source emulation into this code */
 
diff --git a/src/hardware/parport/printer.cpp b/src/hardware/parport/printer.cpp
index a3972ac07..3ae16354a 100644
--- a/src/hardware/parport/printer.cpp
+++ b/src/hardware/parport/printer.cpp
@@ -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-1335, USA.
  */
 
 #include "printer.h"
diff --git a/src/hardware/parport/printer.h b/src/hardware/parport/printer.h
index 7fc348252..c11c4fa3d 100644
--- a/src/hardware/parport/printer.h
+++ b/src/hardware/parport/printer.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 //#include <dosbox.h>
diff --git a/src/hardware/parport/printer_charmaps.h b/src/hardware/parport/printer_charmaps.h
index 174f2cd04..cd2dd29c6 100644
--- a/src/hardware/parport/printer_charmaps.h
+++ b/src/hardware/parport/printer_charmaps.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 typedef struct {
diff --git a/src/hardware/parport/printer_redir.cpp b/src/hardware/parport/printer_redir.cpp
index bd99091e3..868ac71b7 100644
--- a/src/hardware/parport/printer_redir.cpp
+++ b/src/hardware/parport/printer_redir.cpp
@@ -11,7 +11,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-1335, USA.
  */
 
 
diff --git a/src/hardware/pci_bus.cpp b/src/hardware/pci_bus.cpp
index a6f99fee0..78ff15188 100644
--- a/src/hardware/pci_bus.cpp
+++ b/src/hardware/pci_bus.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/pcspeaker.cpp b/src/hardware/pcspeaker.cpp
index bbb2c45c8..e9730b1c4 100644
--- a/src/hardware/pcspeaker.cpp
+++ b/src/hardware/pcspeaker.cpp
@@ -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-1335, USA.
  */
 /* FIXME: This code... well... it could be done better.
  *        It was written back when all mixer callbacks were potentially done from
diff --git a/src/hardware/pic.cpp b/src/hardware/pic.cpp
index b7c048c6a..c768540ab 100644
--- a/src/hardware/pic.cpp
+++ b/src/hardware/pic.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/ps1_sound.cpp b/src/hardware/ps1_sound.cpp
index f24b62618..ae6be6aa9 100644
--- a/src/hardware/ps1_sound.cpp
+++ b/src/hardware/ps1_sound.cpp
@@ -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-1335, USA.
  */
 
 #include <math.h>
diff --git a/src/hardware/reSID/envelope.cpp b/src/hardware/reSID/envelope.cpp
index caa3ca06a..8863af9d7 100644
--- a/src/hardware/reSID/envelope.cpp
+++ b/src/hardware/reSID/envelope.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __ENVELOPE_CC__
diff --git a/src/hardware/reSID/envelope.h b/src/hardware/reSID/envelope.h
index 727315e56..48f3ec9ad 100644
--- a/src/hardware/reSID/envelope.h
+++ b/src/hardware/reSID/envelope.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __ENVELOPE_H__
diff --git a/src/hardware/reSID/extfilt.cpp b/src/hardware/reSID/extfilt.cpp
index eb5e7eaf4..c97d9bf4f 100644
--- a/src/hardware/reSID/extfilt.cpp
+++ b/src/hardware/reSID/extfilt.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __EXTFILT_CC__
diff --git a/src/hardware/reSID/extfilt.h b/src/hardware/reSID/extfilt.h
index 16857bfb8..90dfb538d 100644
--- a/src/hardware/reSID/extfilt.h
+++ b/src/hardware/reSID/extfilt.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __EXTFILT_H__
diff --git a/src/hardware/reSID/filter.cpp b/src/hardware/reSID/filter.cpp
index cd0b82306..d8ec7abb4 100644
--- a/src/hardware/reSID/filter.cpp
+++ b/src/hardware/reSID/filter.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __FILTER_CC__
diff --git a/src/hardware/reSID/filter.h b/src/hardware/reSID/filter.h
index d58b06e3b..d14d16244 100644
--- a/src/hardware/reSID/filter.h
+++ b/src/hardware/reSID/filter.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __FILTER_H__
diff --git a/src/hardware/reSID/pot.cpp b/src/hardware/reSID/pot.cpp
index b60b2ec75..9b906ed78 100644
--- a/src/hardware/reSID/pot.cpp
+++ b/src/hardware/reSID/pot.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "pot.h"
diff --git a/src/hardware/reSID/pot.h b/src/hardware/reSID/pot.h
index 6d44cb1a0..76166b481 100644
--- a/src/hardware/reSID/pot.h
+++ b/src/hardware/reSID/pot.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __POT_H__
diff --git a/src/hardware/reSID/sid.cpp b/src/hardware/reSID/sid.cpp
index 24970f55b..cb2f35507 100644
--- a/src/hardware/reSID/sid.cpp
+++ b/src/hardware/reSID/sid.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "sid.h"
diff --git a/src/hardware/reSID/sid.h b/src/hardware/reSID/sid.h
index 55d9ac65d..40817e0e6 100644
--- a/src/hardware/reSID/sid.h
+++ b/src/hardware/reSID/sid.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __SID_H__
diff --git a/src/hardware/reSID/siddefs.h b/src/hardware/reSID/siddefs.h
index d936c64b0..62e028c3a 100644
--- a/src/hardware/reSID/siddefs.h
+++ b/src/hardware/reSID/siddefs.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __SIDDEFS_H__
diff --git a/src/hardware/reSID/spline.h b/src/hardware/reSID/spline.h
index 93ba2776a..d9414e603 100644
--- a/src/hardware/reSID/spline.h
+++ b/src/hardware/reSID/spline.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __SPLINE_H__
diff --git a/src/hardware/reSID/version.cpp b/src/hardware/reSID/version.cpp
index 3b61afd24..9092a7c19 100644
--- a/src/hardware/reSID/version.cpp
+++ b/src/hardware/reSID/version.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __VERSION_CC__
diff --git a/src/hardware/reSID/voice.cpp b/src/hardware/reSID/voice.cpp
index 6e324e306..532a9e9d5 100644
--- a/src/hardware/reSID/voice.cpp
+++ b/src/hardware/reSID/voice.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __VOICE_CC__
diff --git a/src/hardware/reSID/voice.h b/src/hardware/reSID/voice.h
index fdf47af82..87c890ea8 100644
--- a/src/hardware/reSID/voice.h
+++ b/src/hardware/reSID/voice.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __VOICE_H__
diff --git a/src/hardware/reSID/wave.cpp b/src/hardware/reSID/wave.cpp
index a5ddfffc5..0a65ad798 100644
--- a/src/hardware/reSID/wave.cpp
+++ b/src/hardware/reSID/wave.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #define __WAVE_CC__
diff --git a/src/hardware/reSID/wave.h b/src/hardware/reSID/wave.h
index a3a508eea..509ad8d81 100644
--- a/src/hardware/reSID/wave.h
+++ b/src/hardware/reSID/wave.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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #ifndef __WAVE_H__
diff --git a/src/hardware/reSID/wave6581_PST.cpp b/src/hardware/reSID/wave6581_PST.cpp
index 49a4ea246..db8e0bf72 100644
--- a/src/hardware/reSID/wave6581_PST.cpp
+++ b/src/hardware/reSID/wave6581_PST.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave6581_PS_.cpp b/src/hardware/reSID/wave6581_PS_.cpp
index ffccd23e8..0365037e3 100644
--- a/src/hardware/reSID/wave6581_PS_.cpp
+++ b/src/hardware/reSID/wave6581_PS_.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave6581_P_T.cpp b/src/hardware/reSID/wave6581_P_T.cpp
index a8109eeb1..408b6ab5f 100644
--- a/src/hardware/reSID/wave6581_P_T.cpp
+++ b/src/hardware/reSID/wave6581_P_T.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave6581__ST.cpp b/src/hardware/reSID/wave6581__ST.cpp
index add4d387a..c735f3047 100644
--- a/src/hardware/reSID/wave6581__ST.cpp
+++ b/src/hardware/reSID/wave6581__ST.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave8580_PST.cpp b/src/hardware/reSID/wave8580_PST.cpp
index a3958c192..cd7c4838f 100644
--- a/src/hardware/reSID/wave8580_PST.cpp
+++ b/src/hardware/reSID/wave8580_PST.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave8580_PS_.cpp b/src/hardware/reSID/wave8580_PS_.cpp
index 795044d60..05e70a505 100644
--- a/src/hardware/reSID/wave8580_PS_.cpp
+++ b/src/hardware/reSID/wave8580_PS_.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave8580_P_T.cpp b/src/hardware/reSID/wave8580_P_T.cpp
index a2fff3a23..f6a9e7c24 100644
--- a/src/hardware/reSID/wave8580_P_T.cpp
+++ b/src/hardware/reSID/wave8580_P_T.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/reSID/wave8580__ST.cpp b/src/hardware/reSID/wave8580__ST.cpp
index e50a21d81..47640681d 100644
--- a/src/hardware/reSID/wave8580__ST.cpp
+++ b/src/hardware/reSID/wave8580__ST.cpp
@@ -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-1335 USA  USA
 //  ---------------------------------------------------------------------------
 
 #include "wave.h"
diff --git a/src/hardware/sblaster.cpp b/src/hardware/sblaster.cpp
index 8b483dc3c..2939e74b0 100644
--- a/src/hardware/sblaster.cpp
+++ b/src/hardware/sblaster.cpp
@@ -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-1335, USA.
  */
 /* TODO: I noticed a "bug" on a SB16 ViBRA where if you use single-cycle DMA
  *       playback with DSP 4.xx commands with the FIFO enabled, the card seems
diff --git a/src/hardware/serialport/directserial.cpp b/src/hardware/serialport/directserial.cpp
index 0764a6fc2..a7597b55c 100644
--- a/src/hardware/serialport/directserial.cpp
+++ b/src/hardware/serialport/directserial.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/directserial.h b/src/hardware/serialport/directserial.h
index e910187c5..a6ebf8323 100644
--- a/src/hardware/serialport/directserial.h
+++ b/src/hardware/serialport/directserial.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/libserial.cpp b/src/hardware/serialport/libserial.cpp
index ec41cfacb..cacf0f09e 100644
--- a/src/hardware/serialport/libserial.cpp
+++ b/src/hardware/serialport/libserial.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/libserial.h b/src/hardware/serialport/libserial.h
index 60d6b0858..bd0d76524 100644
--- a/src/hardware/serialport/libserial.h
+++ b/src/hardware/serialport/libserial.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/misc_util.cpp b/src/hardware/serialport/misc_util.cpp
index d2f07ee20..f934f7c01 100644
--- a/src/hardware/serialport/misc_util.cpp
+++ b/src/hardware/serialport/misc_util.cpp
@@ -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-1335, USA.
  */
 
 /* $Id $ */
diff --git a/src/hardware/serialport/misc_util.h b/src/hardware/serialport/misc_util.h
index f62ab1511..f9e8e1588 100644
--- a/src/hardware/serialport/misc_util.h
+++ b/src/hardware/serialport/misc_util.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/nullmodem.cpp b/src/hardware/serialport/nullmodem.cpp
index fb9dcf336..dd4a0a935 100644
--- a/src/hardware/serialport/nullmodem.cpp
+++ b/src/hardware/serialport/nullmodem.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/nullmodem.h b/src/hardware/serialport/nullmodem.h
index c8f48ae61..102f97cc6 100644
--- a/src/hardware/serialport/nullmodem.h
+++ b/src/hardware/serialport/nullmodem.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/serialdummy.cpp b/src/hardware/serialport/serialdummy.cpp
index dd2999f57..8491fa733 100644
--- a/src/hardware/serialport/serialdummy.cpp
+++ b/src/hardware/serialport/serialdummy.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/serialdummy.h b/src/hardware/serialport/serialdummy.h
index 718ee8cbb..fc2fb442e 100644
--- a/src/hardware/serialport/serialdummy.h
+++ b/src/hardware/serialport/serialdummy.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/seriallog.cpp b/src/hardware/serialport/seriallog.cpp
index a86f2d40f..1f4a32e5c 100644
--- a/src/hardware/serialport/seriallog.cpp
+++ b/src/hardware/serialport/seriallog.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/seriallog.h b/src/hardware/serialport/seriallog.h
index 66f699c42..f538b0375 100644
--- a/src/hardware/serialport/seriallog.h
+++ b/src/hardware/serialport/seriallog.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/serialmouse.cpp b/src/hardware/serialport/serialmouse.cpp
index 15c1139a4..41ce0cc63 100644
--- a/src/hardware/serialport/serialmouse.cpp
+++ b/src/hardware/serialport/serialmouse.cpp
@@ -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-1335, USA.
  */
 
 /* Microsoft Serial Mouse compatible emulation.
diff --git a/src/hardware/serialport/serialmouse.h b/src/hardware/serialport/serialmouse.h
index 340aa505c..3c338316e 100644
--- a/src/hardware/serialport/serialmouse.h
+++ b/src/hardware/serialport/serialmouse.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* $Id: serialdummy.h,v 1.5 2009-05-27 09:15:41 qbix79 Exp $ */
diff --git a/src/hardware/serialport/serialport.cpp b/src/hardware/serialport/serialport.cpp
index d33e5e3a3..2059d6fd4 100644
--- a/src/hardware/serialport/serialport.cpp
+++ b/src/hardware/serialport/serialport.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/softmodem.cpp b/src/hardware/serialport/softmodem.cpp
index d0afbdb10..c0555a9c0 100644
--- a/src/hardware/serialport/softmodem.cpp
+++ b/src/hardware/serialport/softmodem.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/serialport/softmodem.h b/src/hardware/serialport/softmodem.h
index fc6e9db37..f23bbad72 100644
--- a/src/hardware/serialport/softmodem.h
+++ b/src/hardware/serialport/softmodem.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/sn76496.h b/src/hardware/sn76496.h
index 2e7838921..747385cd9 100644
--- a/src/hardware/sn76496.h
+++ b/src/hardware/sn76496.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 /* 
diff --git a/src/hardware/tandy_sound.cpp b/src/hardware/tandy_sound.cpp
index e3202d5c9..9a0a3161c 100644
--- a/src/hardware/tandy_sound.cpp
+++ b/src/hardware/tandy_sound.cpp
@@ -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-1335, USA.
  */
 
 /* 
diff --git a/src/hardware/timer.cpp b/src/hardware/timer.cpp
index 177aa206d..52adc2bde 100644
--- a/src/hardware/timer.cpp
+++ b/src/hardware/timer.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga.cpp b/src/hardware/vga.cpp
index 1dff7190e..117d3a92b 100644
--- a/src/hardware/vga.cpp
+++ b/src/hardware/vga.cpp
@@ -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-1335, USA.
  */
 
 /* NTS: Hardware notes
diff --git a/src/hardware/vga_attr.cpp b/src/hardware/vga_attr.cpp
index fd2f1ac0c..ecb62483d 100644
--- a/src/hardware/vga_attr.cpp
+++ b/src/hardware/vga_attr.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_crtc.cpp b/src/hardware/vga_crtc.cpp
index 3ee07d703..edcb8bc5b 100644
--- a/src/hardware/vga_crtc.cpp
+++ b/src/hardware/vga_crtc.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_dac.cpp b/src/hardware/vga_dac.cpp
index 5559b79ee..b71138561 100644
--- a/src/hardware/vga_dac.cpp
+++ b/src/hardware/vga_dac.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp
index 044f11630..3adb3a0ba 100644
--- a/src/hardware/vga_draw.cpp
+++ b/src/hardware/vga_draw.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_gfx.cpp b/src/hardware/vga_gfx.cpp
index fe14f263a..91ab43f89 100644
--- a/src/hardware/vga_gfx.cpp
+++ b/src/hardware/vga_gfx.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_memory.cpp b/src/hardware/vga_memory.cpp
index a5493afa2..204884c01 100644
--- a/src/hardware/vga_memory.cpp
+++ b/src/hardware/vga_memory.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_misc.cpp b/src/hardware/vga_misc.cpp
index b71868fcf..344272da3 100644
--- a/src/hardware/vga_misc.cpp
+++ b/src/hardware/vga_misc.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_other.cpp b/src/hardware/vga_other.cpp
index b8c1c617a..941042c09 100644
--- a/src/hardware/vga_other.cpp
+++ b/src/hardware/vga_other.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_paradise.cpp b/src/hardware/vga_paradise.cpp
index 0b1fc854b..29da211c2 100644
--- a/src/hardware/vga_paradise.cpp
+++ b/src/hardware/vga_paradise.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_pc98_cg.cpp b/src/hardware/vga_pc98_cg.cpp
index 436f61768..a2ec4ca6e 100644
--- a/src/hardware/vga_pc98_cg.cpp
+++ b/src/hardware/vga_pc98_cg.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_pc98_crtc.cpp b/src/hardware/vga_pc98_crtc.cpp
index e907dceb5..45a10002f 100644
--- a/src/hardware/vga_pc98_crtc.cpp
+++ b/src/hardware/vga_pc98_crtc.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_pc98_dac.cpp b/src/hardware/vga_pc98_dac.cpp
index 11b84159a..e28c49a39 100644
--- a/src/hardware/vga_pc98_dac.cpp
+++ b/src/hardware/vga_pc98_dac.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_pc98_egc.cpp b/src/hardware/vga_pc98_egc.cpp
index 170036e35..e1cd1a987 100644
--- a/src/hardware/vga_pc98_egc.cpp
+++ b/src/hardware/vga_pc98_egc.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_pc98_gdc.cpp b/src/hardware/vga_pc98_gdc.cpp
index 65247f409..2ee92df90 100644
--- a/src/hardware/vga_pc98_gdc.cpp
+++ b/src/hardware/vga_pc98_gdc.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/hardware/vga_s3.cpp b/src/hardware/vga_s3.cpp
index 385136c40..6653747e0 100644
--- a/src/hardware/vga_s3.cpp
+++ b/src/hardware/vga_s3.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_seq.cpp b/src/hardware/vga_seq.cpp
index a9d93b2ac..2eda65a41 100644
--- a/src/hardware/vga_seq.cpp
+++ b/src/hardware/vga_seq.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_tseng.cpp b/src/hardware/vga_tseng.cpp
index 435546908..6796102ee 100644
--- a/src/hardware/vga_tseng.cpp
+++ b/src/hardware/vga_tseng.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/vga_xga.cpp b/src/hardware/vga_xga.cpp
index 303f63251..1c73a1210 100644
--- a/src/hardware/vga_xga.cpp
+++ b/src/hardware/vga_xga.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo.cpp b/src/hardware/voodoo.cpp
index 298bd0d36..42b25b469 100644
--- a/src/hardware/voodoo.cpp
+++ b/src/hardware/voodoo.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo_emu.h b/src/hardware/voodoo_emu.h
index f613d80cf..07a3c3bcc 100644
--- a/src/hardware/voodoo_emu.h
+++ b/src/hardware/voodoo_emu.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo_interface.cpp b/src/hardware/voodoo_interface.cpp
index 23c42534a..a8b1b09fc 100644
--- a/src/hardware/voodoo_interface.cpp
+++ b/src/hardware/voodoo_interface.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo_interface.h b/src/hardware/voodoo_interface.h
index 18b04342f..1a744d46c 100644
--- a/src/hardware/voodoo_interface.h
+++ b/src/hardware/voodoo_interface.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo_opengl.cpp b/src/hardware/voodoo_opengl.cpp
index 9edda3a13..8cac11e88 100644
--- a/src/hardware/voodoo_opengl.cpp
+++ b/src/hardware/voodoo_opengl.cpp
@@ -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-1335, USA.
  */
 
 // Tell Mac OS X to shut up about deprecated OpenGL calls
diff --git a/src/hardware/voodoo_opengl.h b/src/hardware/voodoo_opengl.h
index 3657f66e6..53d97a924 100644
--- a/src/hardware/voodoo_opengl.h
+++ b/src/hardware/voodoo_opengl.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/hardware/voodoo_vogl.cpp b/src/hardware/voodoo_vogl.cpp
index b73b031e5..67c37f91e 100644
--- a/src/hardware/voodoo_vogl.cpp
+++ b/src/hardware/voodoo_vogl.cpp
@@ -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-1335, USA.
  */
 
 // Tell Mac OS X to shut up about deprecated OpenGL calls
diff --git a/src/hardware/voodoo_vogl.h b/src/hardware/voodoo_vogl.h
index 8e9cae39d..7b41c71d4 100644
--- a/src/hardware/voodoo_vogl.h
+++ b/src/hardware/voodoo_vogl.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp
index 889fcf3f9..c86f45cc0 100644
--- a/src/ints/bios.cpp
+++ b/src/ints/bios.cpp
@@ -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-1335, USA.
  */
 
 #include <assert.h>
diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp
index 3cdc3a5e3..5e7463dc0 100644
--- a/src/ints/bios_disk.cpp
+++ b/src/ints/bios_disk.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/ints/bios_keyboard.cpp b/src/ints/bios_keyboard.cpp
index 73cf324f9..36734e5b9 100644
--- a/src/ints/bios_keyboard.cpp
+++ b/src/ints/bios_keyboard.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/bios_memdisk.cpp b/src/ints/bios_memdisk.cpp
index e20ddd2c5..2e880bd9d 100644
--- a/src/ints/bios_memdisk.cpp
+++ b/src/ints/bios_memdisk.cpp
@@ -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-1335, USA.
 */
 
 #include "dosbox.h"
diff --git a/src/ints/bios_vhd.cpp b/src/ints/bios_vhd.cpp
index 3d60811e9..4fe7bb4fe 100644
--- a/src/ints/bios_vhd.cpp
+++ b/src/ints/bios_vhd.cpp
@@ -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-1335, USA.
 */
 
 #include "dosbox.h"
diff --git a/src/ints/ems.cpp b/src/ints/ems.cpp
index cd8187cf0..7e5adf427 100644
--- a/src/ints/ems.cpp
+++ b/src/ints/ems.cpp
@@ -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-1335, USA.
  */
 
 #include <assert.h>
diff --git a/src/ints/int10.cpp b/src/ints/int10.cpp
index 9927193fc..2d4297e62 100644
--- a/src/ints/int10.cpp
+++ b/src/ints/int10.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10.h b/src/ints/int10.h
index f95a1c0e2..da8f9a2ad 100644
--- a/src/ints/int10.h
+++ b/src/ints/int10.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 
diff --git a/src/ints/int10_char.cpp b/src/ints/int10_char.cpp
index 96aa5fc4d..a739f4cc3 100644
--- a/src/ints/int10_char.cpp
+++ b/src/ints/int10_char.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_memory.cpp b/src/ints/int10_memory.cpp
index a1b33f630..714e8bd45 100644
--- a/src/ints/int10_memory.cpp
+++ b/src/ints/int10_memory.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_misc.cpp b/src/ints/int10_misc.cpp
index 9f7639286..6e55ffd09 100644
--- a/src/ints/int10_misc.cpp
+++ b/src/ints/int10_misc.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_modes.cpp b/src/ints/int10_modes.cpp
index 6b43a0c77..62bfac052 100644
--- a/src/ints/int10_modes.cpp
+++ b/src/ints/int10_modes.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_pal.cpp b/src/ints/int10_pal.cpp
index 28c5a5995..530d9bb2d 100644
--- a/src/ints/int10_pal.cpp
+++ b/src/ints/int10_pal.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/ints/int10_put_pixel.cpp b/src/ints/int10_put_pixel.cpp
index 0a73ff102..281586589 100644
--- a/src/ints/int10_put_pixel.cpp
+++ b/src/ints/int10_put_pixel.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_vesa.cpp b/src/ints/int10_vesa.cpp
index df4da987b..cf55fbb5a 100644
--- a/src/ints/int10_vesa.cpp
+++ b/src/ints/int10_vesa.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_video_state.cpp b/src/ints/int10_video_state.cpp
index 53a59c608..2f76d068e 100644
--- a/src/ints/int10_video_state.cpp
+++ b/src/ints/int10_video_state.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/int10_vptable.cpp b/src/ints/int10_vptable.cpp
index 87ac6c7f1..8341ac3b8 100644
--- a/src/ints/int10_vptable.cpp
+++ b/src/ints/int10_vptable.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/mouse.cpp b/src/ints/mouse.cpp
index 863574f08..38c0ddca1 100644
--- a/src/ints/mouse.cpp
+++ b/src/ints/mouse.cpp
@@ -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-1335, USA.
  */
 
 /* TODO: If biosps2=true and aux=false, also allow an option (default disabled)
diff --git a/src/ints/qcow2_disk.cpp b/src/ints/qcow2_disk.cpp
index dff919f87..bc6a328e3 100644
--- a/src/ints/qcow2_disk.cpp
+++ b/src/ints/qcow2_disk.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/xms.cpp b/src/ints/xms.cpp
index e5e230c0b..723289aa4 100644
--- a/src/ints/xms.cpp
+++ b/src/ints/xms.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/ints/xms.h b/src/ints/xms.h
index d104a8860..683b3de37 100644
--- a/src/ints/xms.h
+++ b/src/ints/xms.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __XMS_H__
diff --git a/src/libs/zmbv/drvproc.cpp b/src/libs/zmbv/drvproc.cpp
index 3559a0f91..991438c9e 100644
--- a/src/libs/zmbv/drvproc.cpp
+++ b/src/libs/zmbv/drvproc.cpp
@@ -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-1335, USA.
  */
 //
 // Zipped Motion Block Video
diff --git a/src/libs/zmbv/zmbv.cpp b/src/libs/zmbv/zmbv.cpp
index 6c4425d6c..d85730e0b 100644
--- a/src/libs/zmbv/zmbv.cpp
+++ b/src/libs/zmbv/zmbv.cpp
@@ -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-1335, USA.
  */
 
 #include <zlib.h>
diff --git a/src/libs/zmbv/zmbv.h b/src/libs/zmbv/zmbv.h
index 3a29d47bc..0e608ebb7 100644
--- a/src/libs/zmbv/zmbv.h
+++ b/src/libs/zmbv/zmbv.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef DOSBOX_DOSBOX_H
diff --git a/src/libs/zmbv/zmbv_vfw.cpp b/src/libs/zmbv/zmbv_vfw.cpp
index d6abeca4e..388ce1bfd 100644
--- a/src/libs/zmbv/zmbv_vfw.cpp
+++ b/src/libs/zmbv/zmbv_vfw.cpp
@@ -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-1335, USA.
  */
 //
 // Zipped Motion Block Video
diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp
index e2d829e05..7b561d6ed 100644
--- a/src/misc/cross.cpp
+++ b/src/misc/cross.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp
index ac19c31a8..b799758c5 100644
--- a/src/misc/messages.cpp
+++ b/src/misc/messages.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp
index 719308eb8..8ce842fd1 100644
--- a/src/misc/programs.cpp
+++ b/src/misc/programs.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp
index c2cd141ea..d685e8f4b 100644
--- a/src/misc/setup.cpp
+++ b/src/misc/setup.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/misc/support.cpp b/src/misc/support.cpp
index 9fcc61e8c..eb5eb1615 100644
--- a/src/misc/support.cpp
+++ b/src/misc/support.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/output/direct3d/ScalingEffect.cpp b/src/output/direct3d/ScalingEffect.cpp
index db3c991d2..4a212bdeb 100644
--- a/src/output/direct3d/ScalingEffect.cpp
+++ b/src/output/direct3d/ScalingEffect.cpp
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 #include "dosbox.h"
diff --git a/src/output/direct3d/ScalingEffect.h b/src/output/direct3d/ScalingEffect.h
index e75557192..76f148f00 100644
--- a/src/output/direct3d/ScalingEffect.h
+++ b/src/output/direct3d/ScalingEffect.h
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 */
 
 #pragma once
diff --git a/src/output/direct3d/direct3d.cpp b/src/output/direct3d/direct3d.cpp
index c2a7beb8c..0b30485ad 100644
--- a/src/output/direct3d/direct3d.cpp
+++ b/src/output/direct3d/direct3d.cpp
@@ -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-1335, USA.
  */
 
 #include "dosbox.h"
diff --git a/src/output/direct3d/direct3d.h b/src/output/direct3d/direct3d.h
index 112e68975..9d82064d7 100644
--- a/src/output/direct3d/direct3d.h
+++ b/src/output/direct3d/direct3d.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __DIRECT3D_H_
diff --git a/src/output/direct3d/hq2x_d3d.cpp b/src/output/direct3d/hq2x_d3d.cpp
index 057ac19a9..f7bf644d6 100644
--- a/src/output/direct3d/hq2x_d3d.cpp
+++ b/src/output/direct3d/hq2x_d3d.cpp
@@ -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-1335, USA.
  */
 
 #include "hq2x_d3d.h"
diff --git a/src/output/direct3d/hq2x_d3d.h b/src/output/direct3d/hq2x_d3d.h
index a8c9ae67e..d8f44d657 100644
--- a/src/output/direct3d/hq2x_d3d.h
+++ b/src/output/direct3d/hq2x_d3d.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
  */
 
 #ifndef __HQ2X_DIRECT3D_H_
diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index d344d2b86..d14ac8569 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -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-1335, USA.
  */
 
 #include <assert.h>
diff --git a/src/shell/shell_batch.cpp b/src/shell/shell_batch.cpp
index 440ae4c02..e187bddc6 100644
--- a/src/shell/shell_batch.cpp
+++ b/src/shell/shell_batch.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp
index fbe15ec09..227437c6d 100644
--- a/src/shell/shell_cmds.cpp
+++ b/src/shell/shell_cmds.cpp
@@ -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-1335, USA.
  */
 
 
diff --git a/src/shell/shell_misc.cpp b/src/shell/shell_misc.cpp
index c3267d4c6..64572f334 100644
--- a/src/shell/shell_misc.cpp
+++ b/src/shell/shell_misc.cpp
@@ -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-1335, USA.
  */
 
 #include <assert.h>
diff --git a/vs2015/config.h b/vs2015/config.h
index 8afd72396..8fb61d767 100644
--- a/vs2015/config.h
+++ b/vs2015/config.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-1335, USA.
  */
 
 /* DOSBox-X currently targets Windows XP or higher. */
diff --git a/vs2015/config.h.backup b/vs2015/config.h.backup
index 2d78c44fa..f9f3f34a2 100644
--- a/vs2015/config.h.backup
+++ b/vs2015/config.h.backup
@@ -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-1335, USA.
  */
 
 
diff --git a/vs2015/freetype/builds/unix/pkg.m4 b/vs2015/freetype/builds/unix/pkg.m4
index 260e1fb92..339ff577f 100644
--- a/vs2015/freetype/builds/unix/pkg.m4
+++ b/vs2015/freetype/builds/unix/pkg.m4
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/vs2015/libpng/contrib/gregbook/COPYING b/vs2015/libpng/contrib/gregbook/COPYING
index a3e977479..3ef84d3f1 100644
--- a/vs2015/libpng/contrib/gregbook/COPYING
+++ b/vs2015/libpng/contrib/gregbook/COPYING
@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/vs2015/libpng/contrib/gregbook/LICENSE b/vs2015/libpng/contrib/gregbook/LICENSE
index d9567178c..2748af561 100644
--- a/vs2015/libpng/contrib/gregbook/LICENSE
+++ b/vs2015/libpng/contrib/gregbook/LICENSE
@@ -45,6 +45,6 @@
 
       You should have received a copy of the GNU General Public 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-1335 USA  USA
 
   ---------------------------------------------------------------------------
diff --git a/vs2015/libpng/contrib/gregbook/readpng.c b/vs2015/libpng/contrib/gregbook/readpng.c
index fad9b536a..99e94284c 100644
--- a/vs2015/libpng/contrib/gregbook/readpng.c
+++ b/vs2015/libpng/contrib/gregbook/readpng.c
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/readpng.h b/vs2015/libpng/contrib/gregbook/readpng.h
index fad9fe3b4..5253ed2c6 100644
--- a/vs2015/libpng/contrib/gregbook/readpng.h
+++ b/vs2015/libpng/contrib/gregbook/readpng.h
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/readpng2.c b/vs2015/libpng/contrib/gregbook/readpng2.c
index 5d13e1530..6c7e34547 100644
--- a/vs2015/libpng/contrib/gregbook/readpng2.c
+++ b/vs2015/libpng/contrib/gregbook/readpng2.c
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------
 
diff --git a/vs2015/libpng/contrib/gregbook/readpng2.h b/vs2015/libpng/contrib/gregbook/readpng2.h
index 6b3660d7c..d8ed61b21 100644
--- a/vs2015/libpng/contrib/gregbook/readpng2.h
+++ b/vs2015/libpng/contrib/gregbook/readpng2.h
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/readppm.c b/vs2015/libpng/contrib/gregbook/readppm.c
index 52e702777..063b760d9 100644
--- a/vs2015/libpng/contrib/gregbook/readppm.c
+++ b/vs2015/libpng/contrib/gregbook/readppm.c
@@ -54,7 +54,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/rpng-win.c b/vs2015/libpng/contrib/gregbook/rpng-win.c
index 1a6f87615..7487d716c 100644
--- a/vs2015/libpng/contrib/gregbook/rpng-win.c
+++ b/vs2015/libpng/contrib/gregbook/rpng-win.c
@@ -73,7 +73,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/rpng-x.c b/vs2015/libpng/contrib/gregbook/rpng-x.c
index 92effaa6d..ffa55e199 100644
--- a/vs2015/libpng/contrib/gregbook/rpng-x.c
+++ b/vs2015/libpng/contrib/gregbook/rpng-x.c
@@ -77,7 +77,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/rpng2-win.c b/vs2015/libpng/contrib/gregbook/rpng2-win.c
index ed6b526ec..f45dfe8f9 100644
--- a/vs2015/libpng/contrib/gregbook/rpng2-win.c
+++ b/vs2015/libpng/contrib/gregbook/rpng2-win.c
@@ -82,7 +82,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/rpng2-x.c b/vs2015/libpng/contrib/gregbook/rpng2-x.c
index af944c0f2..d850b68b9 100644
--- a/vs2015/libpng/contrib/gregbook/rpng2-x.c
+++ b/vs2015/libpng/contrib/gregbook/rpng2-x.c
@@ -93,7 +93,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/wpng.c b/vs2015/libpng/contrib/gregbook/wpng.c
index a8f367fb8..7c70a3142 100644
--- a/vs2015/libpng/contrib/gregbook/wpng.c
+++ b/vs2015/libpng/contrib/gregbook/wpng.c
@@ -84,7 +84,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/writepng.c b/vs2015/libpng/contrib/gregbook/writepng.c
index 055c74374..9d8b1d706 100644
--- a/vs2015/libpng/contrib/gregbook/writepng.c
+++ b/vs2015/libpng/contrib/gregbook/writepng.c
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/libpng/contrib/gregbook/writepng.h b/vs2015/libpng/contrib/gregbook/writepng.h
index 78b966b58..4dc2ab40b 100644
--- a/vs2015/libpng/contrib/gregbook/writepng.h
+++ b/vs2015/libpng/contrib/gregbook/writepng.h
@@ -49,7 +49,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-1335 USA  USA
 
   ---------------------------------------------------------------------------*/
 
diff --git a/vs2015/sdl/include/begin_code.h b/vs2015/sdl/include/begin_code.h
index 27e2f7bc7..ea32c28ea 100644
--- a/vs2015/sdl/include/begin_code.h
+++ b/vs2015/sdl/include/begin_code.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/include/close_code.h b/vs2015/sdl/include/close_code.h
index 19a002466..39a4086bb 100644
--- a/vs2015/sdl/include/close_code.h
+++ b/vs2015/sdl/include/close_code.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/SDL_mixer_m68k.c b/vs2015/sdl/src/audio/SDL_mixer_m68k.c
index 22bb1cb81..56837c658 100644
--- a/vs2015/sdl/src/audio/SDL_mixer_m68k.c
+++ b/vs2015/sdl/src/audio/SDL_mixer_m68k.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/SDL_mixer_m68k.h b/vs2015/sdl/src/audio/SDL_mixer_m68k.h
index 673df0065..68d675f9c 100644
--- a/vs2015/sdl/src/audio/SDL_mixer_m68k.h
+++ b/vs2015/sdl/src/audio/SDL_mixer_m68k.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c b/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c
index f10733e43..81fe4042c 100644
--- a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c
+++ b/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h b/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h
index 55ae87b8a..97e10d909 100644
--- a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h
+++ b/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c b/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c
index e5e0d9480..4b43c5864 100644
--- a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c
+++ b/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h b/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h
index c9f69cf54..b247d1082 100644
--- a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h
+++ b/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio.c
index 46ba690c3..9611d5d5e 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio.h b/vs2015/sdl/src/audio/mint/SDL_mintaudio.h
index ba6056ee3..6df121716 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio.h
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c
index 61feba3d6..3188925f1 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h b/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h
index a52e5db7a..dd3d2316b 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c
index 8d7716a13..b9a6ff5e3 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S b/vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S
index a2ecac4c6..24177a1ae 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c
index 387609b16..ed6c0d764 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h b/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h
index b772fdab0..9dd39ff5f 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c
index 4a581e035..139825c94 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h b/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h
index 1789b4bb4..dfc35780e 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c b/vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c
index 42a0d4a2f..4f3960d3e 100644
--- a/vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c
+++ b/vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.c b/vs2015/sdl/src/audio/mme/SDL_mmeaudio.c
index 64a0ecc36..558823b68 100644
--- a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.c
+++ b/vs2015/sdl/src/audio/mme/SDL_mmeaudio.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.h b/vs2015/sdl/src/audio/mme/SDL_mmeaudio.h
index 6bfaed32e..8f9f38c12 100644
--- a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.h
+++ b/vs2015/sdl/src/audio/mme/SDL_mmeaudio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/nto/SDL_nto_audio.c b/vs2015/sdl/src/audio/nto/SDL_nto_audio.c
index f95182546..54f074068 100644
--- a/vs2015/sdl/src/audio/nto/SDL_nto_audio.c
+++ b/vs2015/sdl/src/audio/nto/SDL_nto_audio.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/nto/SDL_nto_audio.h b/vs2015/sdl/src/audio/nto/SDL_nto_audio.h
index cfd592c96..654df05d7 100644
--- a/vs2015/sdl/src/audio/nto/SDL_nto_audio.h
+++ b/vs2015/sdl/src/audio/nto/SDL_nto_audio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp b/vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp
index 72a4eaf4e..9aeb33672 100644
--- a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp
+++ b/vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.h b/vs2015/sdl/src/audio/symbian/SDL_epocaudio.h
index 5c95c8615..ec9ec20c5 100644
--- a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.h
+++ b/vs2015/sdl/src/audio/symbian/SDL_epocaudio.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h b/vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h
index e715a256d..7bcc5115f 100644
--- a/vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h
+++ b/vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c b/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c
index 97cb9b287..3fb048ec5 100644
--- a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c
+++ b/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h b/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h
index 886d017a5..3f5e13f5a 100644
--- a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h
+++ b/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c b/vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c
index 0007c07f6..1a7e7344b 100644
--- a/vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c
+++ b/vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/CDPlayer.c b/vs2015/sdl/src/cdrom/macosx/CDPlayer.c
index beb87cd85..c00ba70d5 100644
--- a/vs2015/sdl/src/cdrom/macosx/CDPlayer.c
+++ b/vs2015/sdl/src/cdrom/macosx/CDPlayer.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/CDPlayer.h b/vs2015/sdl/src/cdrom/macosx/CDPlayer.h
index be1ac1826..00fde213e 100644
--- a/vs2015/sdl/src/cdrom/macosx/CDPlayer.h
+++ b/vs2015/sdl/src/cdrom/macosx/CDPlayer.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c b/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c
index e8caf1bf1..8c6f0e386 100644
--- a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c
+++ b/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h b/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h
index f22c6956f..67f3edae5 100644
--- a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h
+++ b/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h b/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h
index 589c5897e..277f2932f 100644
--- a/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h
+++ b/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c b/vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c
index 0bc10edb7..a84d06b24 100644
--- a/vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c
+++ b/vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c b/vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c
index 8478a7b4c..4aaa4e7af 100644
--- a/vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c
+++ b/vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
 
 */
diff --git a/vs2015/sdl/src/hermes/COPYING.LIB b/vs2015/sdl/src/hermes/COPYING.LIB
index 69679a563..f1b3e7d92 100644
--- a/vs2015/sdl/src/hermes/COPYING.LIB
+++ b/vs2015/sdl/src/hermes/COPYING.LIB
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    		    51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c b/vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c
index a9ccb35fa..f28f4b270 100644
--- a/vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c
+++ b/vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c
@@ -14,7 +14,7 @@
 
 	You should have received a copy of the GNU Library General Public
 	License along with this library; if not, write to the Free
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
 	Sam Lantinga
 	slouken@libsdl.org
diff --git a/vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp b/vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp
index 683db874f..303326c68 100644
--- a/vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp
+++ b/vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/thread/dc/SDL_systhread_c.h b/vs2015/sdl/src/thread/dc/SDL_systhread_c.h
index 3cda1a4a5..2fbd524b6 100644
--- a/vs2015/sdl/src/thread/dc/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/dc/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/generic/SDL_systhread_c.h b/vs2015/sdl/src/thread/generic/SDL_systhread_c.h
index 1535b5019..249ccedfc 100644
--- a/vs2015/sdl/src/thread/generic/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/generic/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/irix/SDL_systhread_c.h b/vs2015/sdl/src/thread/irix/SDL_systhread_c.h
index ee28634fb..89e4085f2 100644
--- a/vs2015/sdl/src/thread/irix/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/irix/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/os2/SDL_systhread_c.h b/vs2015/sdl/src/thread/os2/SDL_systhread_c.h
index 3b94dfed5..a4ee201b1 100644
--- a/vs2015/sdl/src/thread/os2/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/os2/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/pth/SDL_systhread_c.h b/vs2015/sdl/src/thread/pth/SDL_systhread_c.h
index 50bb26df5..b95529038 100644
--- a/vs2015/sdl/src/thread/pth/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/pth/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/pthread/SDL_systhread_c.h b/vs2015/sdl/src/thread/pthread/SDL_systhread_c.h
index 33ed750ff..442f63d56 100644
--- a/vs2015/sdl/src/thread/pthread/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/pthread/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/riscos/SDL_systhread_c.h b/vs2015/sdl/src/thread/riscos/SDL_systhread_c.h
index 9e1d2c8c5..f3440ef4c 100644
--- a/vs2015/sdl/src/thread/riscos/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/riscos/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp b/vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp
index f4b1aeaad..1e83ab595 100644
--- a/vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp
+++ b/vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/thread/symbian/SDL_syssem.cpp b/vs2015/sdl/src/thread/symbian/SDL_syssem.cpp
index 00f9901ee..bce58e714 100644
--- a/vs2015/sdl/src/thread/symbian/SDL_syssem.cpp
+++ b/vs2015/sdl/src/thread/symbian/SDL_syssem.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/thread/symbian/SDL_systhread.cpp b/vs2015/sdl/src/thread/symbian/SDL_systhread.cpp
index 5e7adc554..03459a911 100644
--- a/vs2015/sdl/src/thread/symbian/SDL_systhread.cpp
+++ b/vs2015/sdl/src/thread/symbian/SDL_systhread.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/thread/symbian/SDL_systhread_c.h b/vs2015/sdl/src/thread/symbian/SDL_systhread_c.h
index f5f1729cd..fb3ea747b 100644
--- a/vs2015/sdl/src/thread/symbian/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/symbian/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/thread/win32/SDL_systhread_c.h b/vs2015/sdl/src/thread/win32/SDL_systhread_c.h
index 10b0a7d6b..56fc2ce97 100644
--- a/vs2015/sdl/src/thread/win32/SDL_systhread_c.h
+++ b/vs2015/sdl/src/thread/win32/SDL_systhread_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/timer/symbian/SDL_systimer.cpp b/vs2015/sdl/src/timer/symbian/SDL_systimer.cpp
index a5bb749ca..a3bb5f301 100644
--- a/vs2015/sdl/src/timer/symbian/SDL_systimer.cpp
+++ b/vs2015/sdl/src/timer/symbian/SDL_systimer.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarigl.c b/vs2015/sdl/src/video/ataricommon/SDL_atarigl.c
index 1cf2689c9..38c6ceec8 100644
--- a/vs2015/sdl/src/video/ataricommon/SDL_atarigl.c
+++ b/vs2015/sdl/src/video/ataricommon/SDL_atarigl.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h b/vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h
index 5adcf2a25..4566c9504 100644
--- a/vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h
+++ b/vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/caca/SDL_cacavideo.c b/vs2015/sdl/src/video/caca/SDL_cacavideo.c
index 59a070ce7..8b097038f 100644
--- a/vs2015/sdl/src/video/caca/SDL_cacavideo.c
+++ b/vs2015/sdl/src/video/caca/SDL_cacavideo.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Hocevar
     sam@zoy.org
diff --git a/vs2015/sdl/src/video/caca/SDL_cacavideo.h b/vs2015/sdl/src/video/caca/SDL_cacavideo.h
index 91fcc817a..00f96142b 100644
--- a/vs2015/sdl/src/video/caca/SDL_cacavideo.h
+++ b/vs2015/sdl/src/video/caca/SDL_cacavideo.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Hocevar
     sam@zoy.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxevents.c b/vs2015/sdl/src/video/nanox/SDL_nxevents.c
index 788c794d2..bd9669795 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxevents.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nxevents.c
@@ -16,7 +16,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxevents_c.h b/vs2015/sdl/src/video/nanox/SDL_nxevents_c.h
index b3b4f979b..a71785a8a 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxevents_c.h
+++ b/vs2015/sdl/src/video/nanox/SDL_nxevents_c.h
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nximage.c b/vs2015/sdl/src/video/nanox/SDL_nximage.c
index 23d3157cb..3eeb502dd 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nximage.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nximage.c
@@ -16,7 +16,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nximage_c.h b/vs2015/sdl/src/video/nanox/SDL_nximage_c.h
index 0bf29e561..fa031d5c7 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nximage_c.h
+++ b/vs2015/sdl/src/video/nanox/SDL_nximage_c.h
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmodes.c b/vs2015/sdl/src/video/nanox/SDL_nxmodes.c
index bcf74e50c..1f29f467a 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxmodes.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nxmodes.c
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h b/vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h
index fe2e655e9..466a5e50e 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h
+++ b/vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmouse.c b/vs2015/sdl/src/video/nanox/SDL_nxmouse.c
index 9c8f38205..2208a4f96 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxmouse.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nxmouse.c
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxvideo.c b/vs2015/sdl/src/video/nanox/SDL_nxvideo.c
index b188e0958..2802c6643 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxvideo.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nxvideo.c
@@ -16,7 +16,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxvideo.h b/vs2015/sdl/src/video/nanox/SDL_nxvideo.h
index 1d858d96f..ae0ae03d6 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxvideo.h
+++ b/vs2015/sdl/src/video/nanox/SDL_nxvideo.h
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxwm.c b/vs2015/sdl/src/video/nanox/SDL_nxwm.c
index c60ebb046..fe80221ee 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxwm.c
+++ b/vs2015/sdl/src/video/nanox/SDL_nxwm.c
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/nanox/SDL_nxwm_c.h b/vs2015/sdl/src/video/nanox/SDL_nxwm_c.h
index 77be794f2..af2eed7a6 100644
--- a/vs2015/sdl/src/video/nanox/SDL_nxwm_c.h
+++ b/vs2015/sdl/src/video/nanox/SDL_nxwm_c.h
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c b/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c
index a902d1fe7..faa6bfa1c 100644
--- a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c
+++ b/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h b/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h
index 6d58baf0a..96d2cde84 100644
--- a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h
+++ b/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/photon/SDL_ph_video.h b/vs2015/sdl/src/video/photon/SDL_ph_video.h
index 3995d3505..997938b33 100644
--- a/vs2015/sdl/src/video/photon/SDL_ph_video.h
+++ b/vs2015/sdl/src/video/photon/SDL_ph_video.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc b/vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc
index 8daf1c524..adcb5c8b7 100644
--- a/vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc
+++ b/vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/CGS.h b/vs2015/sdl/src/video/quartz/CGS.h
index abe47f732..a90df437b 100644
--- a/vs2015/sdl/src/video/quartz/CGS.h
+++ b/vs2015/sdl/src/video/quartz/CGS.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m b/vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m
index 3176b7f67..4c5b78ab6 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzGL.m b/vs2015/sdl/src/video/quartz/SDL_QuartzGL.m
index d38dceb56..1cdc1307a 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzGL.m
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzGL.m
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h b/vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h
index 82b78595e..8ead9733f 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h b/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h
index fa1eb66bd..fdcc7b096 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m b/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m
index 26b0aa5eb..0ace520af 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.h b/vs2015/sdl/src/video/quartz/SDL_QuartzWM.h
index 0b0767e8e..1756006e2 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.h
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzWM.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.m b/vs2015/sdl/src/video/quartz/SDL_QuartzWM.m
index 9bf7b8b77..ae33780e8 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.m
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzWM.m
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h b/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h
index 5798aa170..22c5ff915 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m b/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m
index 0de0e03db..b75b1bc9d 100644
--- a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m
+++ b/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosASM.S b/vs2015/sdl/src/video/riscos/SDL_riscosASM.S
index fae32f84d..e0a7f7cad 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscosASM.S
+++ b/vs2015/sdl/src/video/riscos/SDL_riscosASM.S
@@ -14,7 +14,7 @@
 ;
 ;    You should have received a copy of the GNU Library General Public
 ;    License along with this library; if not, write to the Free
-;    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 ;
 ;    Sam Lantinga
 ;    slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c b/vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c
index b8c3cf786..d4bdf7d0c 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosevents.c b/vs2015/sdl/src/video/riscos/SDL_riscosevents.c
index 54875076a..946fe32b2 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscosevents.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscosevents.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosmouse.c b/vs2015/sdl/src/video/riscos/SDL_riscosmouse.c
index b4a0bffc9..1d33438fb 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscosmouse.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscosmouse.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscossprite.c b/vs2015/sdl/src/video/riscos/SDL_riscossprite.c
index 70b2f919d..20c5a2b44 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscossprite.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscossprite.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscostask.c b/vs2015/sdl/src/video/riscos/SDL_riscostask.c
index 67dc3e2fe..16b12cbc3 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscostask.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscostask.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscostask.h b/vs2015/sdl/src/video/riscos/SDL_riscostask.h
index 5744afa9d..a12f6a11e 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscostask.h
+++ b/vs2015/sdl/src/video/riscos/SDL_riscostask.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosvideo.c b/vs2015/sdl/src/video/riscos/SDL_riscosvideo.c
index bae5e374d..684537095 100644
--- a/vs2015/sdl/src/video/riscos/SDL_riscosvideo.c
+++ b/vs2015/sdl/src/video/riscos/SDL_riscosvideo.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_wimppoll.c b/vs2015/sdl/src/video/riscos/SDL_wimppoll.c
index 499966453..6ee044f7a 100644
--- a/vs2015/sdl/src/video/riscos/SDL_wimppoll.c
+++ b/vs2015/sdl/src/video/riscos/SDL_wimppoll.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/riscos/SDL_wimpvideo.c b/vs2015/sdl/src/video/riscos/SDL_wimpvideo.c
index 0f9c5451d..ae4c0726b 100644
--- a/vs2015/sdl/src/video/riscos/SDL_wimpvideo.c
+++ b/vs2015/sdl/src/video/riscos/SDL_wimpvideo.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp
index 5ceed5fe3..c87f17987 100644
--- a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp
+++ b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp
index 06874d546..d6b157fe3 100644
--- a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp
+++ b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h
index bd0b0e29c..202c910c6 100644
--- a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h
+++ b/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp b/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp
index c15506ddc..a454a20a9 100644
--- a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp
+++ b/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h b/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h
index 5aa3a2024..eac6238a8 100644
--- a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h
+++ b/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/symbian/SDL_epocevents_c.h b/vs2015/sdl/src/video/symbian/SDL_epocevents_c.h
index 8e10a0429..5b6b0a06b 100644
--- a/vs2015/sdl/src/video/symbian/SDL_epocevents_c.h
+++ b/vs2015/sdl/src/video/symbian/SDL_epocevents_c.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@devolution.com
diff --git a/vs2015/sdl/src/video/x11/SDL_x11dyn.c b/vs2015/sdl/src/video/x11/SDL_x11dyn.c
index 7058addfa..fa31e02c1 100644
--- a/vs2015/sdl/src/video/x11/SDL_x11dyn.c
+++ b/vs2015/sdl/src/video/x11/SDL_x11dyn.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/x11/SDL_x11dyn.h b/vs2015/sdl/src/video/x11/SDL_x11dyn.h
index c2ff82a72..496940882 100644
--- a/vs2015/sdl/src/video/x11/SDL_x11dyn.h
+++ b/vs2015/sdl/src/video/x11/SDL_x11dyn.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/x11/SDL_x11sym.h b/vs2015/sdl/src/video/x11/SDL_x11sym.h
index cc58bd435..efbd56d6e 100644
--- a/vs2015/sdl/src/video/x11/SDL_x11sym.h
+++ b/vs2015/sdl/src/video/x11/SDL_x11sym.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c b/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c
index 2950b84f1..203fae77d 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h b/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h
index 09a3651bd..eb0a197ae 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c b/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c
index 6daade2e5..e406b7b80 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h b/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h
index dfe88d9ea..a82084914 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.c b/vs2015/sdl/src/video/xbios/SDL_xbios_milan.c
index a99ee18c5..a5111cde5 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.c
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_milan.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.h b/vs2015/sdl/src/video/xbios/SDL_xbios_milan.h
index bcf5c8a5b..283174b34 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.h
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_milan.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c b/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c
index 8b0ed2c62..a70fca0f8 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h b/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h
index 3272c3134..32e8de107 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c b/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c
index b0f849919..99957a624 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h b/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h
index 8a9cd7d46..032ba4234 100644
--- a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h
+++ b/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA  USA
 
     Sam Lantinga
     slouken@libsdl.org
diff --git a/vs2015/sdl2/src/hidapi/m4/pkg.m4 b/vs2015/sdl2/src/hidapi/m4/pkg.m4
index 0048a3fa0..21a701f03 100644
--- a/vs2015/sdl2/src/hidapi/m4/pkg.m4
+++ b/vs2015/sdl2/src/hidapi/m4/pkg.m4
@@ -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-1335, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/vs2015/sdl2/test/acinclude.m4 b/vs2015/sdl2/test/acinclude.m4
index ead69e514..13ca1a74b 100644
--- a/vs2015/sdl2/test/acinclude.m4
+++ b/vs2015/sdl2/test/acinclude.m4
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
 #
 # You should have received a copy of the GNU General Public 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-1335, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/vs2015/sdl2/test/aclocal.m4 b/vs2015/sdl2/test/aclocal.m4
index b6244940e..2c8d31490 100644
--- a/vs2015/sdl2/test/aclocal.m4
+++ b/vs2015/sdl2/test/aclocal.m4
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
 #
 # You should have received a copy of the GNU General Public 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-1335, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/vs2015/sdlnet/acinclude/pkg.m4 b/vs2015/sdlnet/acinclude/pkg.m4
index 0048a3fa0..21a701f03 100644
--- a/vs2015/sdlnet/acinclude/pkg.m4
+++ b/vs2015/sdlnet/acinclude/pkg.m4
@@ -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-1335, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/vs2015/zlib/contrib/ada/zlib.ads b/vs2015/zlib/contrib/ada/zlib.ads
index 79ffc4095..3d94cf5f4 100644
--- a/vs2015/zlib/contrib/ada/zlib.ads
+++ b/vs2015/zlib/contrib/ada/zlib.ads
@@ -15,7 +15,7 @@
 --                                                                          --
 --  You should have received a copy of the GNU 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.          --
+--  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.          --
 --                                                                          --
 --  As a special exception, if other files instantiate generics from this   --
 --  unit, or you link this unit with other files to produce an executable,  --