diff --git a/doc/License.txt b/doc/License.txt
index f40e7d37..55482bd9 100644
--- a/doc/License.txt
+++ b/doc/License.txt
@@ -25,4 +25,4 @@ 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.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/project/vs2010_mfc/VBA2010.vcxproj b/project/vs2010_mfc/VBA2010.vcxproj
index 63c7b4bc..fa1e73f2 100644
--- a/project/vs2010_mfc/VBA2010.vcxproj
+++ b/project/vs2010_mfc/VBA2010.vcxproj
@@ -676,7 +676,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties RESOURCE_FILE="\Users\Shawn\Desktop\shuffle2proj\vba-m\src\win32\VBA.rc" />
+      <UserProperties RESOURCE_FILE="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/src/AutoBuild.h b/src/AutoBuild.h
index 4048589e..0380d6cb 100644
--- a/src/AutoBuild.h
+++ b/src/AutoBuild.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __AUTOBUILD_H__
 #define __AUTOBUILD_H__
diff --git a/src/common/SoundDriver.h b/src/common/SoundDriver.h
index 31de4588..b42936ca 100644
--- a/src/common/SoundDriver.h
+++ b/src/common/SoundDriver.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SOUND_DRIVER_H__
 #define __VBA_SOUND_DRIVER_H__
diff --git a/src/common/SoundSDL.cpp b/src/common/SoundSDL.cpp
index 3afbde09..f49e6f8b 100644
--- a/src/common/SoundSDL.cpp
+++ b/src/common/SoundSDL.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "SoundSDL.h"
 
diff --git a/src/common/SoundSDL.h b/src/common/SoundSDL.h
index 3d94c123..35c92abf 100644
--- a/src/common/SoundSDL.h
+++ b/src/common/SoundSDL.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SOUND_SDL_H__
 #define __VBA_SOUND_SDL_H__
diff --git a/src/common/Types.h b/src/common/Types.h
index 8433576d..d8bd4c13 100644
--- a/src/common/Types.h
+++ b/src/common/Types.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_TYPES_H__
 #define __VBA_TYPES_H__
diff --git a/src/filters/2xSaImmx.asm b/src/filters/2xSaImmx.asm
index f2403021..931feba3 100644
--- a/src/filters/2xSaImmx.asm
+++ b/src/filters/2xSaImmx.asm
@@ -13,7 +13,7 @@
 ;
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software Foundation,
-; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+; Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ; The author released that file under GPLv2+ on the Fedora legal list :
 ; http://lists.fedoraproject.org/pipermail/legal/2009-October/000947.html
diff --git a/src/gtk/cheatedit.cpp b/src/gtk/cheatedit.cpp
index 76b5de1e..6cbf58d9 100644
--- a/src/gtk/cheatedit.cpp
+++ b/src/gtk/cheatedit.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "cheatedit.h"
 
diff --git a/src/gtk/cheatedit.h b/src/gtk/cheatedit.h
index 7a349152..5b677161 100644
--- a/src/gtk/cheatedit.h
+++ b/src/gtk/cheatedit.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_CHEATEDIT_H__
 #define __VBA_CHEATEDIT_H__
diff --git a/src/gtk/cheatlist.cpp b/src/gtk/cheatlist.cpp
index 46145c83..4502242d 100644
--- a/src/gtk/cheatlist.cpp
+++ b/src/gtk/cheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "cheatlist.h"
 
diff --git a/src/gtk/cheatlist.h b/src/gtk/cheatlist.h
index 90900c38..b8f85da6 100644
--- a/src/gtk/cheatlist.h
+++ b/src/gtk/cheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_CHEATLIST_H__
 #define __VBA_CHEATLIST_H__
diff --git a/src/gtk/configfile.cpp b/src/gtk/configfile.cpp
index 18995625..433ae3e6 100644
--- a/src/gtk/configfile.cpp
+++ b/src/gtk/configfile.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "configfile.h"
 
diff --git a/src/gtk/configfile.h b/src/gtk/configfile.h
index 468a3383..e14034be 100644
--- a/src/gtk/configfile.h
+++ b/src/gtk/configfile.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_CONFIGFILE_H__
 #define __VBA_CONFIGFILE_H__
diff --git a/src/gtk/directoriesconfig.cpp b/src/gtk/directoriesconfig.cpp
index 526858b0..adff4e2b 100644
--- a/src/gtk/directoriesconfig.cpp
+++ b/src/gtk/directoriesconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "directoriesconfig.h"
 
diff --git a/src/gtk/directoriesconfig.h b/src/gtk/directoriesconfig.h
index 454e787f..f1f4a2d9 100644
--- a/src/gtk/directoriesconfig.h
+++ b/src/gtk/directoriesconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_DIRECTORIESCONFIG_H__
 #define __VBA_DIRECTORIESCONFIG_H__
diff --git a/src/gtk/displayconfig.cpp b/src/gtk/displayconfig.cpp
index c18e8815..d446c81c 100644
--- a/src/gtk/displayconfig.cpp
+++ b/src/gtk/displayconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "displayconfig.h"
 
diff --git a/src/gtk/displayconfig.h b/src/gtk/displayconfig.h
index 378237fe..9879f397 100644
--- a/src/gtk/displayconfig.h
+++ b/src/gtk/displayconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_DISPLAYCONFIG_H__
 #define __VBA_DISPLAYCONFIG_H__
diff --git a/src/gtk/filters.cpp b/src/gtk/filters.cpp
index 2db2b439..fae36529 100644
--- a/src/gtk/filters.cpp
+++ b/src/gtk/filters.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "filters.h"
 #include "intl.h"
diff --git a/src/gtk/filters.h b/src/gtk/filters.h
index 90f495db..bc4dea60 100644
--- a/src/gtk/filters.h
+++ b/src/gtk/filters.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_FILTERS_H__
 #define __VBA_FILTERS_H__
diff --git a/src/gtk/gameboyadvancecheatlist.cpp b/src/gtk/gameboyadvancecheatlist.cpp
index f0cb1b50..8d947b0f 100644
--- a/src/gtk/gameboyadvancecheatlist.cpp
+++ b/src/gtk/gameboyadvancecheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gameboyadvancecheatlist.h"
 #include "tools.h"
diff --git a/src/gtk/gameboyadvancecheatlist.h b/src/gtk/gameboyadvancecheatlist.h
index e81b9a08..26770241 100644
--- a/src/gtk/gameboyadvancecheatlist.h
+++ b/src/gtk/gameboyadvancecheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_GAMEBOYADVANCECHEATLIST_H__
 #define __VBA_GAMEBOYADVANCECHEATLIST_H__
diff --git a/src/gtk/gameboyadvanceconfig.cpp b/src/gtk/gameboyadvanceconfig.cpp
index 6094a4c2..5b2b311f 100644
--- a/src/gtk/gameboyadvanceconfig.cpp
+++ b/src/gtk/gameboyadvanceconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gameboyadvanceconfig.h"
 
diff --git a/src/gtk/gameboyadvanceconfig.h b/src/gtk/gameboyadvanceconfig.h
index 07dab178..3d2294b5 100644
--- a/src/gtk/gameboyadvanceconfig.h
+++ b/src/gtk/gameboyadvanceconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_GAMEBOYADVANCECONFIG_H__
 #define __VBA_GAMEBOYADVANCECONFIG_H__
diff --git a/src/gtk/gameboycheatlist.cpp b/src/gtk/gameboycheatlist.cpp
index c3573965..3657f0a0 100644
--- a/src/gtk/gameboycheatlist.cpp
+++ b/src/gtk/gameboycheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gameboycheatlist.h"
 #include "tools.h"
diff --git a/src/gtk/gameboycheatlist.h b/src/gtk/gameboycheatlist.h
index c6b13048..5f9a9a9c 100644
--- a/src/gtk/gameboycheatlist.h
+++ b/src/gtk/gameboycheatlist.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_GAMEBOYCHEATLIST_H__
 #define __VBA_GAMEBOYCHEATLIST_H__
diff --git a/src/gtk/gameboyconfig.cpp b/src/gtk/gameboyconfig.cpp
index ba4306de..c415fad7 100644
--- a/src/gtk/gameboyconfig.cpp
+++ b/src/gtk/gameboyconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gameboyconfig.h"
 
diff --git a/src/gtk/gameboyconfig.h b/src/gtk/gameboyconfig.h
index 09348f1d..d5a2b772 100644
--- a/src/gtk/gameboyconfig.h
+++ b/src/gtk/gameboyconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_GAMEBOYCONFIG_H__
 #define __VBA_GAMEBOYCONFIG_H__
diff --git a/src/gtk/generalconfig.cpp b/src/gtk/generalconfig.cpp
index f9b6b142..fc01e79a 100644
--- a/src/gtk/generalconfig.cpp
+++ b/src/gtk/generalconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "generalconfig.h"
 
diff --git a/src/gtk/generalconfig.h b/src/gtk/generalconfig.h
index d842a7f5..e34afca2 100644
--- a/src/gtk/generalconfig.h
+++ b/src/gtk/generalconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_GENERALCONFIG_H__
 #define __VBA_GENERALCONFIG_H__
diff --git a/src/gtk/intl.h b/src/gtk/intl.h
index 88fe4b08..039261bf 100644
--- a/src/gtk/intl.h
+++ b/src/gtk/intl.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_INTL_H__
 #define __VBA_INTL_H__
diff --git a/src/gtk/joypadconfig.cpp b/src/gtk/joypadconfig.cpp
index 04472307..3a009d11 100644
--- a/src/gtk/joypadconfig.cpp
+++ b/src/gtk/joypadconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "joypadconfig.h"
 
diff --git a/src/gtk/joypadconfig.h b/src/gtk/joypadconfig.h
index 1b110b27..7b621604 100644
--- a/src/gtk/joypadconfig.h
+++ b/src/gtk/joypadconfig.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_JOYPADCONFIG_H__
 #define __VBA_JOYPADCONFIG_H__
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index b22ce8d8..cb078e39 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
diff --git a/src/gtk/screenarea-cairo.cpp b/src/gtk/screenarea-cairo.cpp
index f8c5fbd7..25a81acf 100644
--- a/src/gtk/screenarea-cairo.cpp
+++ b/src/gtk/screenarea-cairo.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "screenarea-cairo.h"
 
diff --git a/src/gtk/screenarea-cairo.h b/src/gtk/screenarea-cairo.h
index 0c1f226a..5a5be909 100644
--- a/src/gtk/screenarea-cairo.h
+++ b/src/gtk/screenarea-cairo.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SCREENAREA_CAIRO_H__
 #define __VBA_SCREENAREA_CAIRO_H__
diff --git a/src/gtk/screenarea-opengl.cpp b/src/gtk/screenarea-opengl.cpp
index ab21b646..924eb297 100644
--- a/src/gtk/screenarea-opengl.cpp
+++ b/src/gtk/screenarea-opengl.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "screenarea-opengl.h"
 #include "intl.h"
diff --git a/src/gtk/screenarea-opengl.h b/src/gtk/screenarea-opengl.h
index 8873e6c7..acb0b014 100644
--- a/src/gtk/screenarea-opengl.h
+++ b/src/gtk/screenarea-opengl.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SCREENAREA_OPENGL_H__
 #define __VBA_SCREENAREA_OPENGL_H__
diff --git a/src/gtk/screenarea.cpp b/src/gtk/screenarea.cpp
index e4bd8024..cb0e181c 100644
--- a/src/gtk/screenarea.cpp
+++ b/src/gtk/screenarea.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "screenarea.h"
 
diff --git a/src/gtk/screenarea.h b/src/gtk/screenarea.h
index dc1ecada..65b60190 100644
--- a/src/gtk/screenarea.h
+++ b/src/gtk/screenarea.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SCREENAREA_H__
 #define __VBA_SCREENAREA_H__
diff --git a/src/gtk/soundconfig.cpp b/src/gtk/soundconfig.cpp
index 4309a6e6..36f48c03 100644
--- a/src/gtk/soundconfig.cpp
+++ b/src/gtk/soundconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "soundconfig.h"
 
diff --git a/src/gtk/soundconfig.h b/src/gtk/soundconfig.h
index 5778708c..e4445a90 100644
--- a/src/gtk/soundconfig.h
+++ b/src/gtk/soundconfig.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_SOUNDCONFIG_H__
 #define __VBA_SOUNDCONFIG_H__
diff --git a/src/gtk/system.cpp b/src/gtk/system.cpp
index 543ce3dd..9f37ced9 100644
--- a/src/gtk/system.cpp
+++ b/src/gtk/system.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "../sdl/inputSDL.h"
 #include "../gba/Sound.h"
diff --git a/src/gtk/tools.cpp b/src/gtk/tools.cpp
index b4aa4366..8e1ced83 100644
--- a/src/gtk/tools.cpp
+++ b/src/gtk/tools.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "tools.h"
 
diff --git a/src/gtk/tools.h b/src/gtk/tools.h
index 842397a8..ab292691 100644
--- a/src/gtk/tools.h
+++ b/src/gtk/tools.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_TOOLS_H__
 #define __VBA_TOOLS_H__
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 59ac4b6e..3daf24b1 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "window.h"
 
diff --git a/src/gtk/window.h b/src/gtk/window.h
index 09f83d7c..2488ebfb 100644
--- a/src/gtk/window.h
+++ b/src/gtk/window.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef __VBA_WINDOW_H__
 #define __VBA_WINDOW_H__
diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp
index d77ed3a4..1380bffb 100644
--- a/src/gtk/windowcallbacks.cpp
+++ b/src/gtk/windowcallbacks.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "window.h"
 
diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
index 987b4ac8..f1e70f9e 100644
--- a/src/sdl/SDL.cpp
+++ b/src/sdl/SDL.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/src/sdl/debugger.cpp b/src/sdl/debugger.cpp
index e1bfc07f..8b771111 100644
--- a/src/sdl/debugger.cpp
+++ b/src/sdl/debugger.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Parts adapted from VBA-H (VBA for Hackers) by LabMaster
 
diff --git a/src/sdl/debugger.h b/src/sdl/debugger.h
index 1632702e..ec4ceab2 100644
--- a/src/sdl/debugger.h
+++ b/src/sdl/debugger.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 extern void debuggerMain();
 extern void debuggerOutput(const char *, u32);
diff --git a/src/sdl/exprNode.cpp b/src/sdl/exprNode.cpp
index 06a04926..ac198894 100644
--- a/src/sdl/exprNode.cpp
+++ b/src/sdl/exprNode.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/sdl/exprNode.h b/src/sdl/exprNode.h
index 8295b486..5b505d72 100644
--- a/src/sdl/exprNode.h
+++ b/src/sdl/exprNode.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 struct Node {
   Type *type;
diff --git a/src/sdl/filters.cpp b/src/sdl/filters.cpp
index 7e136918..503f8b0a 100644
--- a/src/sdl/filters.cpp
+++ b/src/sdl/filters.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "filters.h"
 
diff --git a/src/sdl/filters.h b/src/sdl/filters.h
index 434c51fa..9733e453 100644
--- a/src/sdl/filters.h
+++ b/src/sdl/filters.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef VBA_SDL_FILTERS_H
 #define VBA_SDL_FILTERS_H
diff --git a/src/sdl/inputSDL.cpp b/src/sdl/inputSDL.cpp
index c463b8be..6c54e09c 100644
--- a/src/sdl/inputSDL.cpp
+++ b/src/sdl/inputSDL.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "inputSDL.h"
 
diff --git a/src/sdl/inputSDL.h b/src/sdl/inputSDL.h
index c70b42e7..cf930724 100644
--- a/src/sdl/inputSDL.h
+++ b/src/sdl/inputSDL.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef VBAM_SDL_INPUT_H
 #define VBAM_SDL_INPUT_H
diff --git a/src/sdl/text.h b/src/sdl/text.h
index 0bf23635..32edd332 100644
--- a/src/sdl/text.h
+++ b/src/sdl/text.h
@@ -15,6 +15,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-1301, USA.
 
 extern void drawText(u8 *, int, int, int, const char *, bool);
diff --git a/src/version.h b/src/version.h
index 1fd6b8a9..c32a84c3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #define VBA_NAME "VisualBoyAdvance-M"
 
diff --git a/src/win32/BugReport.cpp b/src/win32/BugReport.cpp
index 22566297..6888216e 100644
--- a/src/win32/BugReport.cpp
+++ b/src/win32/BugReport.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // BugReport.cpp : implementation file
 //
diff --git a/src/win32/BugReport.h b/src/win32/BugReport.h
index 6d5a0cff..179df29b 100644
--- a/src/win32/BugReport.h
+++ b/src/win32/BugReport.h
@@ -15,7 +15,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #if !defined(AFX_BUGREPORT_H__DE7BC381_E45D_4200_910C_E5378E6364C9__INCLUDED_)
 #define AFX_BUGREPORT_H__DE7BC381_E45D_4200_910C_E5378E6364C9__INCLUDED_
diff --git a/src/win32/GameOverrides.h b/src/win32/GameOverrides.h
index d7e359b6..3fe6b232 100644
--- a/src/win32/GameOverrides.h
+++ b/src/win32/GameOverrides.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.
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "afxwin.h"
 #if !defined(AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_)