diff --git a/COPYING b/COPYING
index e22b4bd1..c167b1f9 100644
--- a/COPYING
+++ b/COPYING
@@ -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 St, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -464,7 +464,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     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 St, Fifth Floor, Boston, MA  02110-1301, USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/simgear/io/raw_socket.cxx b/simgear/io/raw_socket.cxx
index bb08aae7..d61d71f9 100644
--- a/simgear/io/raw_socket.cxx
+++ b/simgear/io/raw_socket.cxx
@@ -17,7 +17,7 @@
 
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #ifdef HAVE_CONFIG_H
diff --git a/simgear/io/raw_socket.hxx b/simgear/io/raw_socket.hxx
index 7a92a9e5..833b75c3 100644
--- a/simgear/io/raw_socket.hxx
+++ b/simgear/io/raw_socket.hxx
@@ -17,7 +17,7 @@
  
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #ifndef SG_IO_SOCKET_HXX
diff --git a/simgear/io/sg_netBuffer.cxx b/simgear/io/sg_netBuffer.cxx
index 2bbf50b6..a1474973 100644
--- a/simgear/io/sg_netBuffer.cxx
+++ b/simgear/io/sg_netBuffer.cxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/io/sg_netBuffer.hxx b/simgear/io/sg_netBuffer.hxx
index bd180687..e06d7f96 100644
--- a/simgear/io/sg_netBuffer.hxx
+++ b/simgear/io/sg_netBuffer.hxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/io/sg_netChannel.cxx b/simgear/io/sg_netChannel.cxx
index a189f681..b903a980 100644
--- a/simgear/io/sg_netChannel.cxx
+++ b/simgear/io/sg_netChannel.cxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/io/sg_netChannel.hxx b/simgear/io/sg_netChannel.hxx
index 0ccc8607..6cadc1f3 100644
--- a/simgear/io/sg_netChannel.hxx
+++ b/simgear/io/sg_netChannel.hxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/io/sg_netChat.cxx b/simgear/io/sg_netChat.cxx
index 72064013..4de77163 100644
--- a/simgear/io/sg_netChat.cxx
+++ b/simgear/io/sg_netChat.cxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/io/sg_netChat.hxx b/simgear/io/sg_netChat.hxx
index abba2b68..41097c0a 100644
--- a/simgear/io/sg_netChat.hxx
+++ b/simgear/io/sg_netChat.hxx
@@ -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 Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  
      For further information visit http://plib.sourceforge.net
 
diff --git a/simgear/scene/util/CopyOp.cxx b/simgear/scene/util/CopyOp.cxx
index 50a6d663..fc050cdc 100644
--- a/simgear/scene/util/CopyOp.cxx
+++ b/simgear/scene/util/CopyOp.cxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
diff --git a/simgear/scene/util/CopyOp.hxx b/simgear/scene/util/CopyOp.hxx
index 891b5a08..7c0971dd 100644
--- a/simgear/scene/util/CopyOp.hxx
+++ b/simgear/scene/util/CopyOp.hxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 
 #ifndef SIMGEAR_COPYOP_HXX
 #define SIMGEAR_COPYOP_HXX 1
diff --git a/simgear/scene/util/UpdateOnceCallback.cxx b/simgear/scene/util/UpdateOnceCallback.cxx
index 7130b507..2615df4a 100644
--- a/simgear/scene/util/UpdateOnceCallback.cxx
+++ b/simgear/scene/util/UpdateOnceCallback.cxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA
 
 #include "UpdateOnceCallback.hxx"
 
diff --git a/simgear/scene/util/UpdateOnceCallback.hxx b/simgear/scene/util/UpdateOnceCallback.hxx
index 04034844..c619504f 100644
--- a/simgear/scene/util/UpdateOnceCallback.hxx
+++ b/simgear/scene/util/UpdateOnceCallback.hxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 
 #ifndef SIMGEAR_UPDATEONCECALLBACK_HXX
 #define SIMGEAR_UPDATEONCECALLBACK_HXX 1
diff --git a/simgear/structure/OSGUtils.hxx b/simgear/structure/OSGUtils.hxx
index 557339d0..645ed76f 100644
--- a/simgear/structure/OSGUtils.hxx
+++ b/simgear/structure/OSGUtils.hxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 
 #ifndef SIMGEAR_OSGUTILS_HXX
 #define SIMGEAR_OSGUTILS_HXX 1
diff --git a/simgear/structure/OSGVersion.hxx b/simgear/structure/OSGVersion.hxx
index 46d0187e..b17f77c5 100644
--- a/simgear/structure/OSGVersion.hxx
+++ b/simgear/structure/OSGVersion.hxx
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 
 #ifndef SIMGEAR_OSGVERSION_HXX
 #define SIMGEAR_OSGVERSION_HXX 1
diff --git a/simgear/structure/SGSmplhist.cxx b/simgear/structure/SGSmplhist.cxx
index 760704b3..8a976cea 100644
--- a/simgear/structure/SGSmplhist.cxx
+++ b/simgear/structure/SGSmplhist.cxx
@@ -13,7 +13,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU Library General Public License for more details.
 You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #ifdef HAVE_CONFIG_H
diff --git a/simgear/structure/SGSmplhist.hxx b/simgear/structure/SGSmplhist.hxx
index d9198037..9dee635b 100644
--- a/simgear/structure/SGSmplhist.hxx
+++ b/simgear/structure/SGSmplhist.hxx
@@ -13,7 +13,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU Library General Public License for more details.
 You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #ifndef SampleHistogram_h
diff --git a/simgear/structure/SGSmplstat.cxx b/simgear/structure/SGSmplstat.cxx
index 4080b05f..c9a345a9 100644
--- a/simgear/structure/SGSmplstat.cxx
+++ b/simgear/structure/SGSmplstat.cxx
@@ -13,7 +13,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU Library General Public License for more details.
 You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <math.h>
diff --git a/simgear/structure/SGSmplstat.hxx b/simgear/structure/SGSmplstat.hxx
index c32fef5d..272084e2 100644
--- a/simgear/structure/SGSmplstat.hxx
+++ b/simgear/structure/SGSmplstat.hxx
@@ -13,7 +13,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU Library General Public License for more details.
 You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 #ifndef SampleStatistic_h
 
diff --git a/simgear/version.h.in b/simgear/version.h.in
index 368a4a9a..635495e1 100644
--- a/simgear/version.h.in
+++ b/simgear/version.h.in
@@ -16,8 +16,8 @@
 //
 // You should have received a copy of the GNU Library 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.
+// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA  02110-1301, USA.
 //
 // $Id$