diff --git a/fldigi_doxygen/prog_src_doc/index.txt b/fldigi_doxygen/prog_src_doc/index.txt
index a9bce422..efa47e5c 100644
--- a/fldigi_doxygen/prog_src_doc/index.txt
+++ b/fldigi_doxygen/prog_src_doc/index.txt
@@ -17,8 +17,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with the program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// along with the program; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // =====================================================================
 
 /*!
diff --git a/fldigi_doxygen/user_src_docs/License.txt b/fldigi_doxygen/user_src_docs/License.txt
index bd69fe7a..253d5252 100644
--- a/fldigi_doxygen/user_src_docs/License.txt
+++ b/fldigi_doxygen/user_src_docs/License.txt
@@ -35,8 +35,11 @@ Library General Public License for more details.
 <br>
 
 You should have received a copy of the GNU Library General Public
-License along with the source code for fldigi; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+License along with the source code for fldigi; if not, write to the
+<br>
+  Free Software Foundation, Inc.
+  51 Franklin Street, Fifth Floor
+  Boston, MA  02110-1301 USA.
 <br>
 
 <br>
diff --git a/src/include/Fl_Text_Buffer_mod.H b/src/include/Fl_Text_Buffer_mod.H
index 15ee013b..0b107964 100644
--- a/src/include/Fl_Text_Buffer_mod.H
+++ b/src/include/Fl_Text_Buffer_mod.H
@@ -18,9 +18,11 @@
 // 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, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
+// License along with this library; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
 //
 // Please report all bugs and problems on the following page:
 //
diff --git a/src/include/Fl_Text_Display_mod.H b/src/include/Fl_Text_Display_mod.H
index 920455f6..bcd740a9 100644
--- a/src/include/Fl_Text_Display_mod.H
+++ b/src/include/Fl_Text_Display_mod.H
@@ -18,9 +18,11 @@
 // 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, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
+// License along with this library; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
 //
 // Please report all bugs and problems on the following page:
 //
diff --git a/src/include/Fl_Text_Editor_mod.H b/src/include/Fl_Text_Editor_mod.H
index 0af645c8..cecf621c 100644
--- a/src/include/Fl_Text_Editor_mod.H
+++ b/src/include/Fl_Text_Editor_mod.H
@@ -18,9 +18,11 @@
 // 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, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
+// License along with this library; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
 //
 // Please report all bugs and problems on the following page:
 //
diff --git a/src/include/ax25_decode.h b/src/include/ax25_decode.h
index bdd53874..f576eb15 100644
--- a/src/include/ax25_decode.h
+++ b/src/include/ax25_decode.h
@@ -23,11 +23,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with fldigi; if not, write to the Free Software
-// Foundation, Inc.
-// 59 Temple Place
-// Suite 330
-// Boston, MA  02111-1307  USA
+// along with fldigi; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // ---------------------------------------------------------------------
 
 #ifndef __ax25_decode__
diff --git a/src/include/nco.h b/src/include/nco.h
index f4f55c8c..45e92252 100644
--- a/src/include/nco.h
+++ b/src/include/nco.h
@@ -19,11 +19,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with fldigi; if not, write to the Free Software
-// Foundation, Inc.
-// 59 Temple Place
-// Suite 330
-// Boston, MA  02111-1307  USA
+// along with fldigi; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // ---------------------------------------------------------------------
 
 #ifndef NCO_H
diff --git a/src/include/pkt.h b/src/include/pkt.h
index 4d5733e7..97a6cfd0 100644
--- a/src/include/pkt.h
+++ b/src/include/pkt.h
@@ -23,11 +23,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with fldigi; if not, write to the Free Software
-// Foundation, Inc.
-// 59 Temple Place
-// Suite 330
-// Boston, MA  02111-1307  USA
+// along with fldigi; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // ---------------------------------------------------------------------
 
 #ifndef PKT_H
diff --git a/src/misc/ax25_decode.cxx b/src/misc/ax25_decode.cxx
index b8dfd7a6..6a8b0c26 100644
--- a/src/misc/ax25_decode.cxx
+++ b/src/misc/ax25_decode.cxx
@@ -23,11 +23,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with fldigi; if not, write to the Free Software
-// Foundation, Inc.
-// 59 Temple Place
-// Suite 330
-// Boston, MA  02111-1307  USA
+// along with fldigi; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // ---------------------------------------------------------------------
 
 #include "fl_digi.h"
diff --git a/src/misc/locator.c b/src/misc/locator.c
index c0d17a4d..b7786aaf 100644
--- a/src/misc/locator.c
+++ b/src/misc/locator.c
@@ -44,8 +44,11 @@
  *   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, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   License along with this library; if not, write to the
+ *
+ *  Free Software Foundation, Inc.
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301 USA.
  *
  */
 
diff --git a/src/packet/pkt.cxx b/src/packet/pkt.cxx
index f66b462f..0a9026f9 100644
--- a/src/packet/pkt.cxx
+++ b/src/packet/pkt.cxx
@@ -23,11 +23,12 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with fldigi; if not, write to the Free Software
-// Foundation, Inc.
-// 59 Temple Place
-// Suite 330
-// Boston, MA  02111-1307  USA
+// along with fldigi; if not, write to the
+//
+//  Free Software Foundation, Inc.
+//  51 Franklin Street, Fifth Floor
+//  Boston, MA  02110-1301 USA.
+//
 // ---------------------------------------------------------------------