diff --git a/daemon/src/account.cpp b/daemon/src/account.cpp
index eeddd54fcb8c293c3d2c3ba645b46294b80ac6ec..b57aa9e05b08d6c907917c4c5cec4970df60d37b 100644
--- a/daemon/src/account.cpp
+++ b/daemon/src/account.cpp
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/account.h b/daemon/src/account.h
index 4f9d15b4e5232c3baf7b6663b554f74adef03860..0ef6396732cf2a85a4bab84bb0350378cd0fd3d4 100644
--- a/daemon/src/account.h
+++ b/daemon/src/account.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/account_schema.h b/daemon/src/account_schema.h
index 427495e01a9aa5fff7e19b3874c728a8dfa197ea..34314d4e278992076becbf90df3944e32e2ebfd6 100644
--- a/daemon/src/account_schema.h
+++ b/daemon/src/account_schema.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/array_size.h b/daemon/src/array_size.h
index 9bca08aadb5aa4b6d88f3ad49c71816e063eb7f5..c5467a32aa5adee1c003bd68ea172a8074362b13 100644
--- a/daemon/src/array_size.h
+++ b/daemon/src/array_size.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/call.cpp b/daemon/src/call.cpp
index 22371f9e3f5256e60bdb018eec483e1a56a13be4..e486208055cd36ec7f09407f014020d8d9e5818a 100644
--- a/daemon/src/call.cpp
+++ b/daemon/src/call.cpp
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/call.h b/daemon/src/call.h
index 0553735af51770535b7a11abd168e86e5826ba3e..c8934a20763931087910f7fe4d5ba42dcb8b70b7 100644
--- a/daemon/src/call.h
+++ b/daemon/src/call.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 Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/cc_config.h b/daemon/src/cc_config.h
index 5f391d0b809c104b0423c7d1dbacd2429670ab0e..4d90733e357b8bc96585cbae3f08f5c157d8a1f8 100644
--- a/daemon/src/cc_config.h
+++ b/daemon/src/cc_config.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/cc_thread.h b/daemon/src/cc_thread.h
index fbbaf277e5c08b203ddfdc15374097b37e420a9b..14257169656463f101b5e8ce1c7ddc4a96272177 100644
--- a/daemon/src/cc_thread.h
+++ b/daemon/src/cc_thread.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/codec.h b/daemon/src/codec.h
index 9584ad1a893e91d0052ea199dc39e26acb109cee..96c058c8644a33bbcdde4eafcd5631b865f59081 100644
--- a/daemon/src/codec.h
+++ b/daemon/src/codec.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/conference.cpp b/daemon/src/conference.cpp
index 93fb54b0b1d7e6e98bad483a1ea1a50cb2b58608..7203b5706f352ebf77c4b2fd0a620b9c79aafabc 100644
--- a/daemon/src/conference.cpp
+++ b/daemon/src/conference.cpp
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/conference.h b/daemon/src/conference.h
index de57de4bec76c9e77e83a20af07a9ce50ea8a230..1625f98a7847527c6adcc64ef09ce08a27489368 100644
--- a/daemon/src/conference.h
+++ b/daemon/src/conference.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/eventthread.cpp b/daemon/src/eventthread.cpp
index c46ffb52b4f1ba1f84bf2538e706f2048a220a2c..bf7d71a4d24382f1bc176f579709f214a7007709 100644
--- a/daemon/src/eventthread.cpp
+++ b/daemon/src/eventthread.cpp
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/eventthread.h b/daemon/src/eventthread.h
index 6964e0e0969bdc99c56f12d00d0d70f922b7206d..af0233edbfdd575ce674e5b2d3e419c07ad73f8d 100644
--- a/daemon/src/eventthread.h
+++ b/daemon/src/eventthread.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp
index 0c1b0578c3579e943b17ce5f784b272e4d9aab29..fc4c517a8882c2c1b45c13e15fb892ef933bb790 100644
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/fileutils.h b/daemon/src/fileutils.h
index 9671753589727e8295a3bc61b092b7a664f70c68..21264f5b4a43ff7333b1ebd5f36ea7351cb9f2a4 100644
--- a/daemon/src/fileutils.h
+++ b/daemon/src/fileutils.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/global.h b/daemon/src/global.h
index 895aed5fcb252a4cb0c13d9125484b3b2773d8b6..1048b984e58bc420042db99c7e3f2c2d387750bc 100644
--- a/daemon/src/global.h
+++ b/daemon/src/global.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 Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/logger.cpp b/daemon/src/logger.cpp
index 78cda9f7e3e616be734766c6b67215166a641e26..522512e8aaba55cf71b5f3dbe6a817787d66a6f3 100644
--- a/daemon/src/logger.cpp
+++ b/daemon/src/logger.cpp
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/logger.h b/daemon/src/logger.h
index 31f58b73c00f77a8fdc928990f288395fe020050..969e07e1d41e6cadad3ffdb4021bceac389682b5 100644
--- a/daemon/src/logger.h
+++ b/daemon/src/logger.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/main.cpp b/daemon/src/main.cpp
index 54a7b9b1c7d410ec217628764cbd526ce072079d..18e4f7cdee3a129df17af683f8f86594079256af 100644
--- a/daemon/src/main.cpp
+++ b/daemon/src/main.cpp
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/manager.cpp b/daemon/src/manager.cpp
index b09fde7606417d2f2e8d59a30027dbf061d98627..65293237672ef814453be81196971a96f7c0c214 100644
--- a/daemon/src/manager.cpp
+++ b/daemon/src/manager.cpp
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/manager.h b/daemon/src/manager.h
index fb4694359f12be1ada2d20c684c86ee2138c464e..0b2459b1285bd3cfa2351590e917ade931420c99 100644
--- a/daemon/src/manager.h
+++ b/daemon/src/manager.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 777c4d02a02fbd369f94ca82fbcc287b625ee906..02f18d3bd766f4975169bcf67b310220151fd54b 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -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 Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index fce0db574c10a5ca80933884fbfe834b9b4b861e..1e7538710141a4cdc0957b2a1a250fccdc2bea59 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/managerimpl_registration.cpp b/daemon/src/managerimpl_registration.cpp
index 710596f40b13ce1a0f5944bfe5f47937d6dba7af..20de544b3fa524d5c72eeec286561615c8bc9875 100644
--- a/daemon/src/managerimpl_registration.cpp
+++ b/daemon/src/managerimpl_registration.cpp
@@ -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 Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/noncopyable.h b/daemon/src/noncopyable.h
index 2869194125dce29b1d892edbb0d10179166c53bf..27482c513f82271bded6b46d2b16c972afb08223 100644
--- a/daemon/src/noncopyable.h
+++ b/daemon/src/noncopyable.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/numbercleaner.cpp b/daemon/src/numbercleaner.cpp
index e6fb6b93aa584b63fe9f9cc7e77b6bdfe1ea48f7..09acd936d0ea95cd0c14e66265284b90d5c41e83 100644
--- a/daemon/src/numbercleaner.cpp
+++ b/daemon/src/numbercleaner.cpp
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/numbercleaner.h b/daemon/src/numbercleaner.h
index f131a957866e14a19c2ff776c503b8ec0b917246..eeb81baec2ced635b97bb0099b04c9bfb7379684 100644
--- a/daemon/src/numbercleaner.h
+++ b/daemon/src/numbercleaner.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/preferences.cpp b/daemon/src/preferences.cpp
index 666ca0194d4b8021a67c80447a9a231f294d1918..6b8706702aa032e815ace0f4c053c7efeff020d3 100644
--- a/daemon/src/preferences.cpp
+++ b/daemon/src/preferences.cpp
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/preferences.h b/daemon/src/preferences.h
index f77be59f94d3cecc42d7c0ec833f2b8cc59933c4..3c34cc6dcceaa059f04fb46f466083e8af4dd844 100644
--- a/daemon/src/preferences.h
+++ b/daemon/src/preferences.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/registration_states.h b/daemon/src/registration_states.h
index 4d76ed0229f49d7c9d93b3bd2892366eb2204299..08aee273747935d2f43eacd3903b0f2354e6d974 100644
--- a/daemon/src/registration_states.h
+++ b/daemon/src/registration_states.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/sfl_types.h b/daemon/src/sfl_types.h
index 382eb1c84cd87bf7b286b01a2ad6bf89b150ea21..024fd29791d514b33a2a048fb891c4858405d4f6 100644
--- a/daemon/src/sfl_types.h
+++ b/daemon/src/sfl_types.h
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/voiplink.cpp b/daemon/src/voiplink.cpp
index 4e60c09112435cdee09faae644b5ff8508034f21..d77ff31500d08cb7facd3eef779b4d3213298164 100644
--- a/daemon/src/voiplink.cpp
+++ b/daemon/src/voiplink.cpp
@@ -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 Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *
diff --git a/daemon/src/voiplink.h b/daemon/src/voiplink.h
index 4192edb4b04a2aaa562ea1bd7c5b6b1a4f47ac32..79c1d9eaf48ac7d39171ab0027fd71f7d3b284ba 100644
--- a/daemon/src/voiplink.h
+++ b/daemon/src/voiplink.h
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  *  Additional permission under GNU GPL version 3 section 7:
  *