diff --git a/src/Airports/GenAirports/apt_surface.cxx b/src/Airports/GenAirports/apt_surface.cxx
index 470aefb2..2d6192de 100644
--- a/src/Airports/GenAirports/apt_surface.cxx
+++ b/src/Airports/GenAirports/apt_surface.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: apt_surface.cxx,v 1.31 2005-12-19 16:51:25 curt Exp $
 //
diff --git a/src/Airports/GenAirports/apt_surface.hxx b/src/Airports/GenAirports/apt_surface.hxx
index 81237e0a..8c9c4224 100644
--- a/src/Airports/GenAirports/apt_surface.hxx
+++ b/src/Airports/GenAirports/apt_surface.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: apt_surface.hxx,v 1.9 2005-09-09 20:47:04 curt Exp $
 //
diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx
index 52c56455..4e88aa54 100644
--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: build.cxx,v 1.116 2005-10-31 18:43:02 curt Exp $
 //
diff --git a/src/Airports/GenAirports/build.hxx b/src/Airports/GenAirports/build.hxx
index d1afcab2..03fef3e2 100644
--- a/src/Airports/GenAirports/build.hxx
+++ b/src/Airports/GenAirports/build.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: build.hxx,v 1.10 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/convex_hull.cxx b/src/Airports/GenAirports/convex_hull.cxx
index 62df7b87..56b8f5e3 100644
--- a/src/Airports/GenAirports/convex_hull.cxx
+++ b/src/Airports/GenAirports/convex_hull.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: convex_hull.cxx,v 1.12 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/convex_hull.hxx b/src/Airports/GenAirports/convex_hull.hxx
index de863c34..5fbe7afe 100644
--- a/src/Airports/GenAirports/convex_hull.hxx
+++ b/src/Airports/GenAirports/convex_hull.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: convex_hull.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/elevations.cxx b/src/Airports/GenAirports/elevations.cxx
index 39971073..ce2f5a55 100644
--- a/src/Airports/GenAirports/elevations.cxx
+++ b/src/Airports/GenAirports/elevations.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: elevations.cxx,v 1.8 2005-12-19 16:51:25 curt Exp $
 //
diff --git a/src/Airports/GenAirports/elevations.hxx b/src/Airports/GenAirports/elevations.hxx
index c1cc0754..164f13ad 100644
--- a/src/Airports/GenAirports/elevations.hxx
+++ b/src/Airports/GenAirports/elevations.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: elevations.hxx,v 1.4 2005-09-09 15:05:15 curt Exp $
 //
diff --git a/src/Airports/GenAirports/global.hxx b/src/Airports/GenAirports/global.hxx
index 6b303fc9..559ed66a 100644
--- a/src/Airports/GenAirports/global.hxx
+++ b/src/Airports/GenAirports/global.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: global.hxx,v 1.9 2005-10-31 18:43:27 curt Exp $
 //
diff --git a/src/Airports/GenAirports/lights.cxx b/src/Airports/GenAirports/lights.cxx
index b9489d8b..af3e2859 100644
--- a/src/Airports/GenAirports/lights.cxx
+++ b/src/Airports/GenAirports/lights.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: lights.cxx,v 1.41 2005-12-19 16:51:25 curt Exp $
 //
diff --git a/src/Airports/GenAirports/lights.hxx b/src/Airports/GenAirports/lights.hxx
index 941979a0..b6faa134 100644
--- a/src/Airports/GenAirports/lights.hxx
+++ b/src/Airports/GenAirports/lights.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: lights.hxx,v 1.8 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx
index b03450e9..88930704 100644
--- a/src/Airports/GenAirports/main.cxx
+++ b/src/Airports/GenAirports/main.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: main.cxx,v 1.37 2005/12/19 15:53:21 curt Exp $
 //
diff --git a/src/Airports/GenAirports/point2d.cxx b/src/Airports/GenAirports/point2d.cxx
index 5118e60e..b2cf8787 100644
--- a/src/Airports/GenAirports/point2d.cxx
+++ b/src/Airports/GenAirports/point2d.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: point2d.cxx,v 1.2 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/point2d.hxx b/src/Airports/GenAirports/point2d.hxx
index ebd36274..ca54e926 100644
--- a/src/Airports/GenAirports/point2d.hxx
+++ b/src/Airports/GenAirports/point2d.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: point2d.hxx,v 1.4 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/runway.cxx b/src/Airports/GenAirports/runway.cxx
index 2239d2d8..7a856598 100644
--- a/src/Airports/GenAirports/runway.cxx
+++ b/src/Airports/GenAirports/runway.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: runway.cxx,v 1.18 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/runway.hxx b/src/Airports/GenAirports/runway.hxx
index 2d6e6aaf..fb8b1810 100644
--- a/src/Airports/GenAirports/runway.hxx
+++ b/src/Airports/GenAirports/runway.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: runway.hxx,v 1.16 2005-04-20 18:20:15 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_common.cxx b/src/Airports/GenAirports/rwy_common.cxx
index 21c5ab3f..ab652409 100644
--- a/src/Airports/GenAirports/rwy_common.cxx
+++ b/src/Airports/GenAirports/rwy_common.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_common.cxx,v 1.12 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_common.hxx b/src/Airports/GenAirports/rwy_common.hxx
index 38cc19e6..ca5590a1 100644
--- a/src/Airports/GenAirports/rwy_common.hxx
+++ b/src/Airports/GenAirports/rwy_common.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_common.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx
index 085c19a0..4e132d6f 100644
--- a/src/Airports/GenAirports/rwy_nonprec.cxx
+++ b/src/Airports/GenAirports/rwy_nonprec.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_nonprec.cxx,v 1.16 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_nonprec.hxx b/src/Airports/GenAirports/rwy_nonprec.hxx
index 97a38579..580468a6 100644
--- a/src/Airports/GenAirports/rwy_nonprec.hxx
+++ b/src/Airports/GenAirports/rwy_nonprec.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_nonprec.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx
index d11f94ba..91a94240 100644
--- a/src/Airports/GenAirports/rwy_prec.cxx
+++ b/src/Airports/GenAirports/rwy_prec.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_prec.cxx,v 1.18 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_prec.hxx b/src/Airports/GenAirports/rwy_prec.hxx
index bc2e6888..6925db9b 100644
--- a/src/Airports/GenAirports/rwy_prec.hxx
+++ b/src/Airports/GenAirports/rwy_prec.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_prec.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_simple.cxx b/src/Airports/GenAirports/rwy_simple.cxx
index 25d7de35..5a870fa5 100644
--- a/src/Airports/GenAirports/rwy_simple.cxx
+++ b/src/Airports/GenAirports/rwy_simple.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_simple.cxx,v 1.12 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_simple.hxx b/src/Airports/GenAirports/rwy_simple.hxx
index 67aae88d..5bd8e41f 100644
--- a/src/Airports/GenAirports/rwy_simple.hxx
+++ b/src/Airports/GenAirports/rwy_simple.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_simple.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx
index fe524586..c5ae8e0d 100644
--- a/src/Airports/GenAirports/rwy_visual.cxx
+++ b/src/Airports/GenAirports/rwy_visual.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_visual.cxx,v 1.18 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/rwy_visual.hxx b/src/Airports/GenAirports/rwy_visual.hxx
index 9d3f1a05..911d366d 100644
--- a/src/Airports/GenAirports/rwy_visual.hxx
+++ b/src/Airports/GenAirports/rwy_visual.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: rwy_visual.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/taxiway.cxx b/src/Airports/GenAirports/taxiway.cxx
index 7ed9c45c..adc9baf0 100644
--- a/src/Airports/GenAirports/taxiway.cxx
+++ b/src/Airports/GenAirports/taxiway.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: taxiway.cxx,v 1.13 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports/taxiway.hxx b/src/Airports/GenAirports/taxiway.hxx
index 39c647d1..ff903cf5 100644
--- a/src/Airports/GenAirports/taxiway.hxx
+++ b/src/Airports/GenAirports/taxiway.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: taxiway.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/apt_math.cxx b/src/Airports/GenAirports850/apt_math.cxx
index 7e64e509..ee19480f 100644
--- a/src/Airports/GenAirports850/apt_math.cxx
+++ b/src/Airports/GenAirports850/apt_math.cxx
@@ -10,7 +10,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
 #include <simgear/compiler.h>
diff --git a/src/Airports/GenAirports850/apt_surface.cxx b/src/Airports/GenAirports850/apt_surface.cxx
index c0362e0e..1bc1f4f2 100644
--- a/src/Airports/GenAirports850/apt_surface.cxx
+++ b/src/Airports/GenAirports850/apt_surface.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: apt_surface.cxx,v 1.31 2005-12-19 16:51:25 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/apt_surface.hxx b/src/Airports/GenAirports850/apt_surface.hxx
index 81237e0a..8c9c4224 100644
--- a/src/Airports/GenAirports850/apt_surface.hxx
+++ b/src/Airports/GenAirports850/apt_surface.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: apt_surface.hxx,v 1.9 2005-09-09 20:47:04 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/elevations.cxx b/src/Airports/GenAirports850/elevations.cxx
index 52718581..f507ef3f 100644
--- a/src/Airports/GenAirports850/elevations.cxx
+++ b/src/Airports/GenAirports850/elevations.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: elevations.cxx,v 1.8 2005-12-19 16:51:25 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/elevations.hxx b/src/Airports/GenAirports850/elevations.hxx
index b6f158aa..deb5d416 100644
--- a/src/Airports/GenAirports850/elevations.hxx
+++ b/src/Airports/GenAirports850/elevations.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: elevations.hxx,v 1.4 2005-09-09 15:05:15 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/global.hxx b/src/Airports/GenAirports850/global.hxx
index e612d81b..d70a8f28 100644
--- a/src/Airports/GenAirports850/global.hxx
+++ b/src/Airports/GenAirports850/global.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: global.hxx,v 1.9 2005-10-31 18:43:27 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/helipad.cxx b/src/Airports/GenAirports850/helipad.cxx
index 4040f931..732b9cdc 100644
--- a/src/Airports/GenAirports850/helipad.cxx
+++ b/src/Airports/GenAirports850/helipad.cxx
@@ -10,7 +10,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
 #include <simgear/compiler.h>
diff --git a/src/Airports/GenAirports850/helipad.hxx b/src/Airports/GenAirports850/helipad.hxx
index c3223bab..e168cc61 100644
--- a/src/Airports/GenAirports850/helipad.hxx
+++ b/src/Airports/GenAirports850/helipad.hxx
@@ -10,7 +10,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
 #ifndef _HELIPAD_HXX
diff --git a/src/Airports/GenAirports850/lights.cxx b/src/Airports/GenAirports850/lights.cxx
index 582a1eea..da373197 100644
--- a/src/Airports/GenAirports850/lights.cxx
+++ b/src/Airports/GenAirports850/lights.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/Airports/GenAirports850/main.cxx b/src/Airports/GenAirports850/main.cxx
index 38b3f218..d4104eef 100644
--- a/src/Airports/GenAirports850/main.cxx
+++ b/src/Airports/GenAirports850/main.cxx
@@ -1,20 +1,17 @@
-/* OpenSceneGraph example, osgshaderterrain.
-*
-*  Permission is hereby granted, free of charge, to any person obtaining a copy
-*  of this software and associated documentation files (the "Software"), to deal
-*  in the Software without restriction, including without limitation the rights
-*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*  copies of the Software, and to permit persons to whom the Software is
-*  furnished to do so, subject to the following conditions:
-*
-*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*  THE SOFTWARE.
-*/
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
 
 #include <string.h>
 #include <iostream>
diff --git a/src/Airports/GenAirports850/point2d.cxx b/src/Airports/GenAirports850/point2d.cxx
index 5118e60e..b2cf8787 100644
--- a/src/Airports/GenAirports850/point2d.cxx
+++ b/src/Airports/GenAirports850/point2d.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: point2d.cxx,v 1.2 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/point2d.hxx b/src/Airports/GenAirports850/point2d.hxx
index ebd36274..ca54e926 100644
--- a/src/Airports/GenAirports850/point2d.hxx
+++ b/src/Airports/GenAirports850/point2d.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: point2d.hxx,v 1.4 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Airports/GenAirports850/rwy_gen.cxx b/src/Airports/GenAirports850/rwy_gen.cxx
index 6012787d..240bc3bd 100644
--- a/src/Airports/GenAirports850/rwy_gen.cxx
+++ b/src/Airports/GenAirports850/rwy_gen.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
 #include <simgear/compiler.h>
diff --git a/src/Airports/GenAirports850/rwy_simple.cxx b/src/Airports/GenAirports850/rwy_simple.cxx
index f1b1157d..b9c53714 100644
--- a/src/Airports/GenAirports850/rwy_simple.cxx
+++ b/src/Airports/GenAirports850/rwy_simple.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
 
diff --git a/src/Airports/GenAirports850/texparams.hxx b/src/Airports/GenAirports850/texparams.hxx
index dec7dadc..2d3e3af3 100644
--- a/src/Airports/GenAirports850/texparams.hxx
+++ b/src/Airports/GenAirports850/texparams.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: texparams.hxx,v 1.7 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx
index 91cefa63..f667454c 100644
--- a/src/BuildTiles/Clipper/clipper.cxx
+++ b/src/BuildTiles/Clipper/clipper.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: clipper.cxx,v 1.33 2006-11-29 22:19:33 curt Exp $
  
diff --git a/src/BuildTiles/Clipper/clipper.hxx b/src/BuildTiles/Clipper/clipper.hxx
index bb84e24f..3356e210 100644
--- a/src/BuildTiles/Clipper/clipper.hxx
+++ b/src/BuildTiles/Clipper/clipper.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: clipper.hxx,v 1.11 2007-08-15 14:36:52 curt Exp $
  
diff --git a/src/BuildTiles/Clipper/priorities.cxx b/src/BuildTiles/Clipper/priorities.cxx
index 50279e58..666b29fb 100644
--- a/src/BuildTiles/Clipper/priorities.cxx
+++ b/src/BuildTiles/Clipper/priorities.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
diff --git a/src/BuildTiles/Clipper/priorities.hxx b/src/BuildTiles/Clipper/priorities.hxx
index 7d1bc9db..8582dc9e 100644
--- a/src/BuildTiles/Clipper/priorities.hxx
+++ b/src/BuildTiles/Clipper/priorities.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: names.hxx,v 1.14 2005-09-28 16:43:18 curt Exp $
  
diff --git a/src/BuildTiles/Clipper/testclipper.cxx b/src/BuildTiles/Clipper/testclipper.cxx
index 0af0256b..23be6701 100644
--- a/src/BuildTiles/Clipper/testclipper.cxx
+++ b/src/BuildTiles/Clipper/testclipper.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: testclipper.cxx,v 1.7 2004-11-19 22:25:49 curt Exp $
  
diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx
index aa1fa87e..95600c4e 100644
--- a/src/BuildTiles/GenOutput/genobj.cxx
+++ b/src/BuildTiles/GenOutput/genobj.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genobj.cxx,v 1.26 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/GenOutput/genobj.hxx b/src/BuildTiles/GenOutput/genobj.hxx
index 6438650c..3a24bb9c 100644
--- a/src/BuildTiles/GenOutput/genobj.hxx
+++ b/src/BuildTiles/GenOutput/genobj.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genobj.hxx,v 1.9 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Main/construct.cxx b/src/BuildTiles/Main/construct.cxx
index 00e8195f..dc3ba319 100644
--- a/src/BuildTiles/Main/construct.cxx
+++ b/src/BuildTiles/Main/construct.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: construct.cxx,v 1.4 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Main/construct.hxx b/src/BuildTiles/Main/construct.hxx
index 942d2b8e..07829450 100644
--- a/src/BuildTiles/Main/construct.hxx
+++ b/src/BuildTiles/Main/construct.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: construct.hxx,v 1.13 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx
index 68716da5..8d2ca642 100644
--- a/src/BuildTiles/Main/main.cxx
+++ b/src/BuildTiles/Main/main.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: main.cxx,v 1.58 2005-09-28 16:40:32 curt Exp $
 
diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx
index 55aa024f..2fb83ddc 100644
--- a/src/BuildTiles/Main/master.cxx
+++ b/src/BuildTiles/Main/master.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: master.cxx,v 1.9 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Main/usgs.cxx b/src/BuildTiles/Main/usgs.cxx
index 1c85e30d..7e783ba5 100644
--- a/src/BuildTiles/Main/usgs.cxx
+++ b/src/BuildTiles/Main/usgs.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
diff --git a/src/BuildTiles/Main/usgs.hxx b/src/BuildTiles/Main/usgs.hxx
index 242e398d..b578ddf2 100644
--- a/src/BuildTiles/Main/usgs.hxx
+++ b/src/BuildTiles/Main/usgs.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  
 
 #ifndef _USGS_HXX
diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx
index 4198db2e..f1344d9c 100644
--- a/src/BuildTiles/Match/match.cxx
+++ b/src/BuildTiles/Match/match.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: match.cxx,v 1.21 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Match/match.hxx b/src/BuildTiles/Match/match.hxx
index 4332c2f9..3bd9c68c 100644
--- a/src/BuildTiles/Match/match.hxx
+++ b/src/BuildTiles/Match/match.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: match.hxx,v 1.7 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/BuildTiles/Osgb36/osgb36.cxx b/src/BuildTiles/Osgb36/osgb36.cxx
index ea16a07f..9ddbb6c4 100644
--- a/src/BuildTiles/Osgb36/osgb36.cxx
+++ b/src/BuildTiles/Osgb36/osgb36.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <simgear/compiler.h>
 
diff --git a/src/BuildTiles/Osgb36/osgb36.hxx b/src/BuildTiles/Osgb36/osgb36.hxx
index 0cd757c0..fb176c55 100644
--- a/src/BuildTiles/Osgb36/osgb36.hxx
+++ b/src/BuildTiles/Osgb36/osgb36.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <Geometry/point3d.hxx>
 
diff --git a/src/BuildTiles/Osgb36/uk.cxx b/src/BuildTiles/Osgb36/uk.cxx
index dfc8054e..754f36ce 100644
--- a/src/BuildTiles/Osgb36/uk.cxx
+++ b/src/BuildTiles/Osgb36/uk.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include "uk.hxx"
 
diff --git a/src/BuildTiles/Osgb36/uk.hxx b/src/BuildTiles/Osgb36/uk.hxx
index 55f40eac..6ee76585 100644
--- a/src/BuildTiles/Osgb36/uk.hxx
+++ b/src/BuildTiles/Osgb36/uk.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <Geometry/point3d.hxx>
 
diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients
index 6c2ef1a7..9aef9ec2 100755
--- a/src/BuildTiles/Parallel/fgfs-launch-clients
+++ b/src/BuildTiles/Parallel/fgfs-launch-clients
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # $Id: fgfs-launch-clients,v 1.17 2006-01-24 19:39:48 curt Exp $
 
diff --git a/src/BuildTiles/Parallel/fgfs-launch-server b/src/BuildTiles/Parallel/fgfs-launch-server
index 3964c545..ff8d6bb5 100755
--- a/src/BuildTiles/Parallel/fgfs-launch-server
+++ b/src/BuildTiles/Parallel/fgfs-launch-server
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # $Id: fgfs-launch-server,v 1.9 2005-12-19 15:53:47 curt Exp $
 
diff --git a/src/BuildTiles/Triangulate/triangle.cxx b/src/BuildTiles/Triangulate/triangle.cxx
index 36c82794..1cf30163 100644
--- a/src/BuildTiles/Triangulate/triangle.cxx
+++ b/src/BuildTiles/Triangulate/triangle.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: triangle.cxx,v 1.25 2005-10-31 18:45:19 curt Exp $
 
diff --git a/src/BuildTiles/Triangulate/triangle.hxx b/src/BuildTiles/Triangulate/triangle.hxx
index 20ac71c0..3e15a419 100644
--- a/src/BuildTiles/Triangulate/triangle.hxx
+++ b/src/BuildTiles/Triangulate/triangle.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: triangle.hxx,v 1.7 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/BuildTiles/Triangulate/trieles.cxx b/src/BuildTiles/Triangulate/trieles.cxx
index f9ecbbdf..ef20d757 100644
--- a/src/BuildTiles/Triangulate/trieles.cxx
+++ b/src/BuildTiles/Triangulate/trieles.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trieles.cxx,v 1.2 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/BuildTiles/Triangulate/trieles.hxx b/src/BuildTiles/Triangulate/trieles.hxx
index 697a84f4..b52974c9 100644
--- a/src/BuildTiles/Triangulate/trieles.hxx
+++ b/src/BuildTiles/Triangulate/trieles.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trieles.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Array/array.cxx b/src/Lib/Array/array.cxx
index 0407c412..86668128 100644
--- a/src/Lib/Array/array.cxx
+++ b/src/Lib/Array/array.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: array.cxx,v 1.24 2005-11-10 16:26:59 curt Exp $
 
diff --git a/src/Lib/Array/array.hxx b/src/Lib/Array/array.hxx
index 94119a6d..e3e6124b 100644
--- a/src/Lib/Array/array.hxx
+++ b/src/Lib/Array/array.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: array.hxx,v 1.18 2005-11-10 16:26:59 curt Exp $
 
diff --git a/src/Lib/DEM/dem.cxx b/src/Lib/DEM/dem.cxx
index 2dcbb64a..04e32bf3 100644
--- a/src/Lib/DEM/dem.cxx
+++ b/src/Lib/DEM/dem.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: dem.cxx,v 1.20 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/DEM/dem.hxx b/src/Lib/DEM/dem.hxx
index da96192d..4ec68faf 100644
--- a/src/Lib/DEM/dem.hxx
+++ b/src/Lib/DEM/dem.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: dem.hxx,v 1.11 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/contour_tree.cxx b/src/Lib/Geometry/contour_tree.cxx
index 7dc899ce..846ee908 100644
--- a/src/Lib/Geometry/contour_tree.cxx
+++ b/src/Lib/Geometry/contour_tree.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: contour_tree.cxx,v 1.3 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/contour_tree.hxx b/src/Lib/Geometry/contour_tree.hxx
index 94633a7c..12acc912 100644
--- a/src/Lib/Geometry/contour_tree.hxx
+++ b/src/Lib/Geometry/contour_tree.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: contour_tree.hxx,v 1.5 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/poly_extra.cxx b/src/Lib/Geometry/poly_extra.cxx
index dbe8ba9b..4dc81682 100644
--- a/src/Lib/Geometry/poly_extra.cxx
+++ b/src/Lib/Geometry/poly_extra.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: poly_extra.cxx,v 1.9 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Lib/Geometry/poly_extra.hxx b/src/Lib/Geometry/poly_extra.hxx
index a56a2eaf..d7526ed7 100644
--- a/src/Lib/Geometry/poly_extra.hxx
+++ b/src/Lib/Geometry/poly_extra.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: poly_extra.hxx,v 1.5 2004-11-19 22:25:49 curt Exp $
 //
diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx
index 47b81f91..e11b9231 100644
--- a/src/Lib/Geometry/poly_support.cxx
+++ b/src/Lib/Geometry/poly_support.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: poly_support.cxx,v 1.39 2005-12-31 19:29:26 curt Exp $
 
diff --git a/src/Lib/Geometry/poly_support.hxx b/src/Lib/Geometry/poly_support.hxx
index 99f00966..efdb722d 100644
--- a/src/Lib/Geometry/poly_support.hxx
+++ b/src/Lib/Geometry/poly_support.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: poly_support.hxx,v 1.14 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/trinodes.cxx b/src/Lib/Geometry/trinodes.cxx
index c5723b8a..184f74e8 100644
--- a/src/Lib/Geometry/trinodes.cxx
+++ b/src/Lib/Geometry/trinodes.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trinodes.cxx,v 1.7 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/trinodes.hxx b/src/Lib/Geometry/trinodes.hxx
index 7753d91c..0db825cf 100644
--- a/src/Lib/Geometry/trinodes.hxx
+++ b/src/Lib/Geometry/trinodes.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trinodes.hxx,v 1.7 2004/11/19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/trisegs.cxx b/src/Lib/Geometry/trisegs.cxx
index adab2135..a3bd872c 100644
--- a/src/Lib/Geometry/trisegs.cxx
+++ b/src/Lib/Geometry/trisegs.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trisegs.cxx,v 1.10 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Geometry/trisegs.hxx b/src/Lib/Geometry/trisegs.hxx
index 15b2f317..476e0cec 100644
--- a/src/Lib/Geometry/trisegs.hxx
+++ b/src/Lib/Geometry/trisegs.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: trisegs.hxx,v 1.4 2004/11/19 22:25:50 curt Exp $
 
diff --git a/src/Lib/HGT/hgt.cxx b/src/Lib/HGT/hgt.cxx
index a29c1118..fcf4198a 100644
--- a/src/Lib/HGT/hgt.cxx
+++ b/src/Lib/HGT/hgt.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: hgt.cxx,v 1.7 2005-12-19 16:06:45 curt Exp $
 
diff --git a/src/Lib/HGT/hgt.hxx b/src/Lib/HGT/hgt.hxx
index aeebc66e..faa9f49c 100644
--- a/src/Lib/HGT/hgt.hxx
+++ b/src/Lib/HGT/hgt.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: hgt.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/HGT/srtmbase.cxx b/src/Lib/HGT/srtmbase.cxx
index 5f483031..09c9c7fc 100644
--- a/src/Lib/HGT/srtmbase.cxx
+++ b/src/Lib/HGT/srtmbase.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: hgt.cxx,v 1.7 2005-12-19 16:06:45 curt Exp $
 
diff --git a/src/Lib/HGT/srtmbase.hxx b/src/Lib/HGT/srtmbase.hxx
index 019806ad..d735c395 100644
--- a/src/Lib/HGT/srtmbase.hxx
+++ b/src/Lib/HGT/srtmbase.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: hgt.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Optimize/genfans.cxx b/src/Lib/Optimize/genfans.cxx
index c2ab8fdf..c0398188 100644
--- a/src/Lib/Optimize/genfans.cxx
+++ b/src/Lib/Optimize/genfans.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genfans.cxx,v 1.9 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Optimize/genfans.hxx b/src/Lib/Optimize/genfans.hxx
index 9f4914a4..a542d886 100644
--- a/src/Lib/Optimize/genfans.hxx
+++ b/src/Lib/Optimize/genfans.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genfans.hxx,v 1.7 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Optimize/genstrips.cxx b/src/Lib/Optimize/genstrips.cxx
index 714044c6..88ae298e 100644
--- a/src/Lib/Optimize/genstrips.cxx
+++ b/src/Lib/Optimize/genstrips.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genstrips.cxx,v 1.3 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Optimize/genstrips.hxx b/src/Lib/Optimize/genstrips.hxx
index 9becc35f..f2162192 100644
--- a/src/Lib/Optimize/genstrips.hxx
+++ b/src/Lib/Optimize/genstrips.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: genstrips.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Output/output.cxx b/src/Lib/Output/output.cxx
index a614eec0..f6678df8 100644
--- a/src/Lib/Output/output.cxx
+++ b/src/Lib/Output/output.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: output.cxx,v 1.10 2004-11-19 22:25:50 curt Exp $
 //
diff --git a/src/Lib/Output/output.hxx b/src/Lib/Output/output.hxx
index 5d300138..616f49e3 100644
--- a/src/Lib/Output/output.hxx
+++ b/src/Lib/Output/output.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: output.hxx,v 1.5 2004-11-19 22:25:50 curt Exp $
 //
diff --git a/src/Lib/Polygon/chop-bin.cxx b/src/Lib/Polygon/chop-bin.cxx
index f28cf3e1..4122d1ef 100644
--- a/src/Lib/Polygon/chop-bin.cxx
+++ b/src/Lib/Polygon/chop-bin.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: chop-bin.cxx,v 1.6 2007-11-05 21:58:59 curt Exp $
 
diff --git a/src/Lib/Polygon/chop.hxx b/src/Lib/Polygon/chop.hxx
index 98c7bcd1..3ea2c382 100644
--- a/src/Lib/Polygon/chop.hxx
+++ b/src/Lib/Polygon/chop.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: chop.hxx,v 1.3 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/index.cxx b/src/Lib/Polygon/index.cxx
index cd337c29..e8283e0e 100644
--- a/src/Lib/Polygon/index.cxx
+++ b/src/Lib/Polygon/index.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: index.cxx,v 1.7 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/index.hxx b/src/Lib/Polygon/index.hxx
index 7bac2349..2ce7f070 100644
--- a/src/Lib/Polygon/index.hxx
+++ b/src/Lib/Polygon/index.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: index.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/names.hxx b/src/Lib/Polygon/names.hxx
index 4b7880f8..fe3fb646 100644
--- a/src/Lib/Polygon/names.hxx
+++ b/src/Lib/Polygon/names.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: names.hxx,v 1.16 2007-10-31 15:05:13 curt Exp $
 
diff --git a/src/Lib/Polygon/polygon.cxx b/src/Lib/Polygon/polygon.cxx
index e658fb28..3668790d 100644
--- a/src/Lib/Polygon/polygon.cxx
+++ b/src/Lib/Polygon/polygon.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: polygon.cxx,v 1.30 2007-11-05 14:02:21 curt Exp $
 
diff --git a/src/Lib/Polygon/polygon.hxx b/src/Lib/Polygon/polygon.hxx
index a16355f8..d77d7639 100644
--- a/src/Lib/Polygon/polygon.hxx
+++ b/src/Lib/Polygon/polygon.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: polygon.hxx,v 1.17 2007-11-05 14:02:21 curt Exp $
 
diff --git a/src/Lib/Polygon/simple_clip.cxx b/src/Lib/Polygon/simple_clip.cxx
index 6ceaeab3..0dc6a7c7 100644
--- a/src/Lib/Polygon/simple_clip.cxx
+++ b/src/Lib/Polygon/simple_clip.cxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: simple_clip.cxx,v 1.7 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/simple_clip.hxx b/src/Lib/Polygon/simple_clip.hxx
index 19b91e01..a3487593 100644
--- a/src/Lib/Polygon/simple_clip.hxx
+++ b/src/Lib/Polygon/simple_clip.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: simple_clip.hxx,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/superpoly.cxx b/src/Lib/Polygon/superpoly.cxx
index 7ba7a3dc..f4e73fa5 100644
--- a/src/Lib/Polygon/superpoly.cxx
+++ b/src/Lib/Polygon/superpoly.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: superpoly.cxx,v 1.6 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/superpoly.hxx b/src/Lib/Polygon/superpoly.hxx
index a062fb08..f499d914 100644
--- a/src/Lib/Polygon/superpoly.hxx
+++ b/src/Lib/Polygon/superpoly.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: superpoly.hxx,v 1.9 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/Polygon/texparams.hxx b/src/Lib/Polygon/texparams.hxx
index 80487a7b..568bfe74 100644
--- a/src/Lib/Polygon/texparams.hxx
+++ b/src/Lib/Polygon/texparams.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: texparams.hxx,v 1.7 2004-11-19 22:25:49 curt Exp $
 
diff --git a/src/Lib/TriangleJRS/tri_support.c b/src/Lib/TriangleJRS/tri_support.c
index c221fccb..ae0a1352 100644
--- a/src/Lib/TriangleJRS/tri_support.c
+++ b/src/Lib/TriangleJRS/tri_support.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: tri_support.c,v 1.4 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Lib/TriangleJRS/tri_support.h b/src/Lib/TriangleJRS/tri_support.h
index 373400ec..7cec3385 100644
--- a/src/Lib/TriangleJRS/tri_support.h
+++ b/src/Lib/TriangleJRS/tri_support.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: tri_support.h,v 1.3 2004-11-19 22:25:50 curt Exp $
 
diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx
index e9a5b649..39c37835 100644
--- a/src/Prep/DemChop/demchop.cxx
+++ b/src/Prep/DemChop/demchop.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: demchop.cxx,v 1.13 2004-11-19 22:25:51 curt Exp $
 
diff --git a/src/Prep/DemChop/fillvoids.cxx b/src/Prep/DemChop/fillvoids.cxx
index 517b21cb..a9b0b814 100644
--- a/src/Prep/DemChop/fillvoids.cxx
+++ b/src/Prep/DemChop/fillvoids.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: fillvoids.cxx,v 1.1 2005-11-08 16:30:10 curt Exp $
 
diff --git a/src/Prep/DemChop/hgtchop.cxx b/src/Prep/DemChop/hgtchop.cxx
index bd20744b..5d73ddaf 100644
--- a/src/Prep/DemChop/hgtchop.cxx
+++ b/src/Prep/DemChop/hgtchop.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: hgtchop.cxx,v 1.7 2007-08-15 14:35:36 curt Exp $
 
diff --git a/src/Prep/DemChop/point2d.hxx b/src/Prep/DemChop/point2d.hxx
index e07776e9..a6047a6b 100644
--- a/src/Prep/DemChop/point2d.hxx
+++ b/src/Prep/DemChop/point2d.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: point2d.hxx,v 1.2 2004-11-19 22:25:51 curt Exp $
 //
diff --git a/src/Prep/DemChop/srtmchop.cxx b/src/Prep/DemChop/srtmchop.cxx
index 699d4455..52f96cfb 100644
--- a/src/Prep/DemChop/srtmchop.cxx
+++ b/src/Prep/DemChop/srtmchop.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id:$
 
diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx
index bdc2d8c7..42e19c1e 100644
--- a/src/Prep/DemChop/testassem.cxx
+++ b/src/Prep/DemChop/testassem.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: testassem.cxx,v 1.6 2007-08-15 14:35:36 curt Exp $
 
diff --git a/src/Prep/DemInfo/deminfo.cxx b/src/Prep/DemInfo/deminfo.cxx
index ccb3f7c4..c5ad7bf4 100644
--- a/src/Prep/DemInfo/deminfo.cxx
+++ b/src/Prep/DemInfo/deminfo.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: deminfo.cxx,v 1.7 2004-11-19 22:25:51 curt Exp $
 //
diff --git a/src/Prep/DemRaw2ascii/main.cxx b/src/Prep/DemRaw2ascii/main.cxx
index b915f3d6..c8e26680 100644
--- a/src/Prep/DemRaw2ascii/main.cxx
+++ b/src/Prep/DemRaw2ascii/main.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * $Id: main.c,v 1.4 2004-11-19 22:25:51 curt Exp $
  */
diff --git a/src/Prep/DemRaw2ascii/rawdem.c b/src/Prep/DemRaw2ascii/rawdem.c
index 37feb014..2007c348 100644
--- a/src/Prep/DemRaw2ascii/rawdem.c
+++ b/src/Prep/DemRaw2ascii/rawdem.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * $Id: rawdem.c,v 1.11 2004-11-19 22:25:51 curt Exp $
  */
diff --git a/src/Prep/DemRaw2ascii/rawdem.h b/src/Prep/DemRaw2ascii/rawdem.h
index d615dbb1..6d280853 100644
--- a/src/Prep/DemRaw2ascii/rawdem.h
+++ b/src/Prep/DemRaw2ascii/rawdem.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * $Id: rawdem.h,v 1.4 2004-11-19 22:25:51 curt Exp $
  */
diff --git a/src/Prep/E00Lines/main.cxx b/src/Prep/E00Lines/main.cxx
index 502ac2bb..033f5865 100644
--- a/src/Prep/E00Lines/main.cxx
+++ b/src/Prep/E00Lines/main.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: main.cxx,v 1.18 2004-11-19 22:25:51 curt Exp $
  
diff --git a/src/Prep/GDALChop/gdalchop.cxx b/src/Prep/GDALChop/gdalchop.cxx
index e4f81180..e5de00dc 100644
--- a/src/Prep/GDALChop/gdalchop.cxx
+++ b/src/Prep/GDALChop/gdalchop.cxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id$
 
diff --git a/src/Prep/GSHHS/debug.cxx b/src/Prep/GSHHS/debug.cxx
index e605f3f7..7882592e 100644
--- a/src/Prep/GSHHS/debug.cxx
+++ b/src/Prep/GSHHS/debug.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: debug.cxx,v 1.9 2004-11-19 22:25:51 curt Exp $
  
diff --git a/src/Prep/GSHHS/gshhs_split.cxx b/src/Prep/GSHHS/gshhs_split.cxx
index fea99880..a6801dc2 100644
--- a/src/Prep/GSHHS/gshhs_split.cxx
+++ b/src/Prep/GSHHS/gshhs_split.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: gshhs_split.cxx,v 1.16 2004-11-19 22:25:51 curt Exp $
 
diff --git a/src/Prep/GSHHS/gshhs_split.hxx b/src/Prep/GSHHS/gshhs_split.hxx
index 86bcccb1..32c79e2c 100644
--- a/src/Prep/GSHHS/gshhs_split.hxx
+++ b/src/Prep/GSHHS/gshhs_split.hxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: gshhs_split.hxx,v 1.3 2004-11-19 22:25:51 curt Exp $
 
diff --git a/src/Prep/GSHHS/main.cxx b/src/Prep/GSHHS/main.cxx
index 55763efd..049493ad 100644
--- a/src/Prep/GSHHS/main.cxx
+++ b/src/Prep/GSHHS/main.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: main.cxx,v 1.13 2004-11-19 22:25:51 curt Exp $
  
diff --git a/src/Prep/MergerClipper/merger.cxx b/src/Prep/MergerClipper/merger.cxx
index c533315b..f04d27a4 100644
--- a/src/Prep/MergerClipper/merger.cxx
+++ b/src/Prep/MergerClipper/merger.cxx
@@ -19,7 +19,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 --------------------------------------------------------------------------
 */
 
diff --git a/src/Prep/MergerClipper/merger.hxx b/src/Prep/MergerClipper/merger.hxx
index 801674a0..e9f04049 100644
--- a/src/Prep/MergerClipper/merger.hxx
+++ b/src/Prep/MergerClipper/merger.hxx
@@ -19,7 +19,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 --------------------------------------------------------------------------
 */
 //#ifndef _CLIPPER_HXX
diff --git a/src/Prep/MergerClipper/testmerger.cxx b/src/Prep/MergerClipper/testmerger.cxx
index c98d02f5..5560fe30 100644
--- a/src/Prep/MergerClipper/testmerger.cxx
+++ b/src/Prep/MergerClipper/testmerger.cxx
@@ -19,7 +19,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 --------------------------------------------------------------------------
 */
 #ifdef HAVE_CONFIG_H
diff --git a/src/Prep/OGRDecode/ogr-decode.cxx b/src/Prep/OGRDecode/ogr-decode.cxx
index 620a5bfd..860df2ed 100644
--- a/src/Prep/OGRDecode/ogr-decode.cxx
+++ b/src/Prep/OGRDecode/ogr-decode.cxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id$
 
diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx
index 10fd98b6..70f71693 100644
--- a/src/Prep/Photo/photo.cxx
+++ b/src/Prep/Photo/photo.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: photo.cxx,v 1.15 2004-11-19 22:25:51 curt Exp $
 
diff --git a/src/Prep/ShapeFile/noaa-decode.cxx b/src/Prep/ShapeFile/noaa-decode.cxx
index 1bd2c604..2d748a6c 100644
--- a/src/Prep/ShapeFile/noaa-decode.cxx
+++ b/src/Prep/ShapeFile/noaa-decode.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: noaa-decode.cxx,v 1.12 2004-11-19 22:25:52 curt Exp $
  
diff --git a/src/Prep/ShapeFile/shape-decode.cxx b/src/Prep/ShapeFile/shape-decode.cxx
index ddf63ee1..0eede055 100644
--- a/src/Prep/ShapeFile/shape-decode.cxx
+++ b/src/Prep/ShapeFile/shape-decode.cxx
@@ -22,7 +22,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: shape-decode.cxx,v 1.17 2007-11-05 21:58:59 curt Exp $
  
diff --git a/src/Prep/TGVPF/tgvpf.cxx b/src/Prep/TGVPF/tgvpf.cxx
index e3e67d71..8e5aba70 100644
--- a/src/Prep/TGVPF/tgvpf.cxx
+++ b/src/Prep/TGVPF/tgvpf.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 // $Id: tgvpf.cxx,v 1.20 2005-09-28 16:44:05 curt Exp $
  
diff --git a/src/Prep/TerraFit/terrafit.cc b/src/Prep/TerraFit/terrafit.cc
index e8c39b9c..39d93b93 100644
--- a/src/Prep/TerraFit/terrafit.cc
+++ b/src/Prep/TerraFit/terrafit.cc
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <iostream>
 #include <string>
diff --git a/src/Utils/poly2ogr/poly2ogr.cxx b/src/Utils/poly2ogr/poly2ogr.cxx
index 813969cb..c873434b 100644
--- a/src/Utils/poly2ogr/poly2ogr.cxx
+++ b/src/Utils/poly2ogr/poly2ogr.cxx
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include <simgear/compiler.h>