fix #3869: outdated FSF address

294 files changed, 637 insertions, 637 deletions

diff --git a/src/main/java/org/gnunet/arm/Arm.java b/src/main/java/org/gnunet/arm/Arm.java
index 992bc51..97e4212 100644
--- a/src/main/java/org/gnunet/arm/Arm.java
+++ b/src/main/java/org/gnunet/arm/Arm.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm;
diff --git a/src/main/java/org/gnunet/arm/ArmMonitor.java b/src/main/java/org/gnunet/arm/ArmMonitor.java
index 2a2c9c5..d730de2 100644
--- a/src/main/java/org/gnunet/arm/ArmMonitor.java
+++ b/src/main/java/org/gnunet/arm/ArmMonitor.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm;
diff --git a/src/main/java/org/gnunet/arm/ResultHandler.java b/src/main/java/org/gnunet/arm/ResultHandler.java
index 4990cc8..402d1ce 100644
--- a/src/main/java/org/gnunet/arm/ResultHandler.java
+++ b/src/main/java/org/gnunet/arm/ResultHandler.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm;
diff --git a/src/main/java/org/gnunet/arm/ServiceListHandler.java b/src/main/java/org/gnunet/arm/ServiceListHandler.java
index cf5f5be..9dca9a0 100644
--- a/src/main/java/org/gnunet/arm/ServiceListHandler.java
+++ b/src/main/java/org/gnunet/arm/ServiceListHandler.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm;
diff --git a/src/main/java/org/gnunet/arm/ServiceStatusHandler.java b/src/main/java/org/gnunet/arm/ServiceStatusHandler.java
index 5816dec..f84a154 100644
--- a/src/main/java/org/gnunet/arm/ServiceStatusHandler.java
+++ b/src/main/java/org/gnunet/arm/ServiceStatusHandler.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm;
diff --git a/src/main/java/org/gnunet/arm/messages/ListResultMessage.java b/src/main/java/org/gnunet/arm/messages/ListResultMessage.java
index 797a224..2b31330 100644
--- a/src/main/java/org/gnunet/arm/messages/ListResultMessage.java
+++ b/src/main/java/org/gnunet/arm/messages/ListResultMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm.messages;
diff --git a/src/main/java/org/gnunet/arm/messages/RequestMessage.java b/src/main/java/org/gnunet/arm/messages/RequestMessage.java
index 6269e0b..ff42a29 100644
--- a/src/main/java/org/gnunet/arm/messages/RequestMessage.java
+++ b/src/main/java/org/gnunet/arm/messages/RequestMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm.messages;
diff --git a/src/main/java/org/gnunet/arm/messages/ResultMessage.java b/src/main/java/org/gnunet/arm/messages/ResultMessage.java
index b7457cb..208b817 100644
--- a/src/main/java/org/gnunet/arm/messages/ResultMessage.java
+++ b/src/main/java/org/gnunet/arm/messages/ResultMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm.messages;
diff --git a/src/main/java/org/gnunet/arm/messages/StatusMessage.java b/src/main/java/org/gnunet/arm/messages/StatusMessage.java
index cd76a1a..f3f2b1e 100644
--- a/src/main/java/org/gnunet/arm/messages/StatusMessage.java
+++ b/src/main/java/org/gnunet/arm/messages/StatusMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.arm.messages;
diff --git a/src/main/java/org/gnunet/arm/package-info.java b/src/main/java/org/gnunet/arm/package-info.java
index ecbecc6..4a82d9d 100644
--- a/src/main/java/org/gnunet/arm/package-info.java
+++ b/src/main/java/org/gnunet/arm/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/cadet/Cadet.java b/src/main/java/org/gnunet/cadet/Cadet.java
index f8e91f3..e2abe21 100644
--- a/src/main/java/org/gnunet/cadet/Cadet.java
+++ b/src/main/java/org/gnunet/cadet/Cadet.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.cadet;
diff --git a/src/main/java/org/gnunet/cadet/RejectMessage.java b/src/main/java/org/gnunet/cadet/RejectMessage.java
index 921520e..af03c80 100644
--- a/src/main/java/org/gnunet/cadet/RejectMessage.java
+++ b/src/main/java/org/gnunet/cadet/RejectMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.cadet;
diff --git a/src/main/java/org/gnunet/cadet/package-info.java b/src/main/java/org/gnunet/cadet/package-info.java
index 807e64d..5832ac6 100644
--- a/src/main/java/org/gnunet/cadet/package-info.java
+++ b/src/main/java/org/gnunet/cadet/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/consensus/Consensus.java b/src/main/java/org/gnunet/consensus/Consensus.java
index ba3c8ed..88ed627 100644
--- a/src/main/java/org/gnunet/consensus/Consensus.java
+++ b/src/main/java/org/gnunet/consensus/Consensus.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/main/java/org/gnunet/consensus/ConsensusCallback.java b/src/main/java/org/gnunet/consensus/ConsensusCallback.java
index 0e07f52..9640a6a 100644
--- a/src/main/java/org/gnunet/consensus/ConsensusCallback.java
+++ b/src/main/java/org/gnunet/consensus/ConsensusCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/main/java/org/gnunet/consensus/ConsensusElement.java b/src/main/java/org/gnunet/consensus/ConsensusElement.java
index cdc33eb..354afbb 100644
--- a/src/main/java/org/gnunet/consensus/ConsensusElement.java
+++ b/src/main/java/org/gnunet/consensus/ConsensusElement.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/main/java/org/gnunet/consensus/InsertDoneCallback.java b/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
index 39e1292..fc5130b 100644
--- a/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
+++ b/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java b/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
index 6e9c406..849178d 100644
--- a/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus.messages;
diff --git a/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java b/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
index 8189a49..43fa5aa 100644
--- a/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus.messages;
diff --git a/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java b/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
index b5c2483..38e6b70 100644
--- a/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus.messages;
diff --git a/src/main/java/org/gnunet/consensus/messages/JoinMessage.java b/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
index 047f910..0f511bb 100644
--- a/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus.messages;
diff --git a/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java b/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
index 6746f28..cb8a55e 100644
--- a/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus.messages;
diff --git a/src/main/java/org/gnunet/consensus/package-info.java b/src/main/java/org/gnunet/consensus/package-info.java
index 7240056..93cc048 100644
--- a/src/main/java/org/gnunet/consensus/package-info.java
+++ b/src/main/java/org/gnunet/consensus/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/construct/Construct.java b/src/main/java/org/gnunet/construct/Construct.java
index d1641d8..1d512c9 100644
--- a/src/main/java/org/gnunet/construct/Construct.java
+++ b/src/main/java/org/gnunet/construct/Construct.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/DoubleValue.java b/src/main/java/org/gnunet/construct/DoubleValue.java
index fd286cb..36de0df 100644
--- a/src/main/java/org/gnunet/construct/DoubleValue.java
+++ b/src/main/java/org/gnunet/construct/DoubleValue.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/FillWith.java b/src/main/java/org/gnunet/construct/FillWith.java
index 59839fb..eb1bfdb 100644
--- a/src/main/java/org/gnunet/construct/FillWith.java
+++ b/src/main/java/org/gnunet/construct/FillWith.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/FixedSizeArray.java b/src/main/java/org/gnunet/construct/FixedSizeArray.java
index 6712e5f..ab5c11a 100644
--- a/src/main/java/org/gnunet/construct/FixedSizeArray.java
+++ b/src/main/java/org/gnunet/construct/FixedSizeArray.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/FrameSize.java b/src/main/java/org/gnunet/construct/FrameSize.java
index 1edd2dc..39cd995 100644
--- a/src/main/java/org/gnunet/construct/FrameSize.java
+++ b/src/main/java/org/gnunet/construct/FrameSize.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Int16.java b/src/main/java/org/gnunet/construct/Int16.java
index 8167d78..3489a07 100644
--- a/src/main/java/org/gnunet/construct/Int16.java
+++ b/src/main/java/org/gnunet/construct/Int16.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Int32.java b/src/main/java/org/gnunet/construct/Int32.java
index a5ff596..d71c140 100644
--- a/src/main/java/org/gnunet/construct/Int32.java
+++ b/src/main/java/org/gnunet/construct/Int32.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Int64.java b/src/main/java/org/gnunet/construct/Int64.java
index 345eb39..6f77761 100644
--- a/src/main/java/org/gnunet/construct/Int64.java
+++ b/src/main/java/org/gnunet/construct/Int64.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Int8.java b/src/main/java/org/gnunet/construct/Int8.java
index 365df82..0cf040f 100644
--- a/src/main/java/org/gnunet/construct/Int8.java
+++ b/src/main/java/org/gnunet/construct/Int8.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/IntegerFill.java b/src/main/java/org/gnunet/construct/IntegerFill.java
index 6ce8815..66ad9f9 100644
--- a/src/main/java/org/gnunet/construct/IntegerFill.java
+++ b/src/main/java/org/gnunet/construct/IntegerFill.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Message.java b/src/main/java/org/gnunet/construct/Message.java
index e78bdc6..3f6e201 100644
--- a/src/main/java/org/gnunet/construct/Message.java
+++ b/src/main/java/org/gnunet/construct/Message.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java b/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
index 52cf279..4200387 100644
--- a/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
+++ b/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/MessageLoader.java b/src/main/java/org/gnunet/construct/MessageLoader.java
index f7191ef..6063d51 100644
--- a/src/main/java/org/gnunet/construct/MessageLoader.java
+++ b/src/main/java/org/gnunet/construct/MessageLoader.java
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with GNUnet; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/src/main/java/org/gnunet/construct/MessageUnion.java b/src/main/java/org/gnunet/construct/MessageUnion.java
index 4ef96af..6755a80 100644
--- a/src/main/java/org/gnunet/construct/MessageUnion.java
+++ b/src/main/java/org/gnunet/construct/MessageUnion.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/NestedMessage.java b/src/main/java/org/gnunet/construct/NestedMessage.java
index 7c1fc5f..ba02121 100644
--- a/src/main/java/org/gnunet/construct/NestedMessage.java
+++ b/src/main/java/org/gnunet/construct/NestedMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/ProtocolViolationException.java b/src/main/java/org/gnunet/construct/ProtocolViolationException.java
index 10db3da..6cc7ae6 100644
--- a/src/main/java/org/gnunet/construct/ProtocolViolationException.java
+++ b/src/main/java/org/gnunet/construct/ProtocolViolationException.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/ReflectUtil.java b/src/main/java/org/gnunet/construct/ReflectUtil.java
index 770f885..3666f63 100644
--- a/src/main/java/org/gnunet/construct/ReflectUtil.java
+++ b/src/main/java/org/gnunet/construct/ReflectUtil.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/StringTerminationType.java b/src/main/java/org/gnunet/construct/StringTerminationType.java
index 3a1ad96..d6b2a49 100644
--- a/src/main/java/org/gnunet/construct/StringTerminationType.java
+++ b/src/main/java/org/gnunet/construct/StringTerminationType.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/UInt16.java b/src/main/java/org/gnunet/construct/UInt16.java
index ba40630..789975f 100644
--- a/src/main/java/org/gnunet/construct/UInt16.java
+++ b/src/main/java/org/gnunet/construct/UInt16.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/UInt32.java b/src/main/java/org/gnunet/construct/UInt32.java
index 8fa8aba..e4abd1d 100644
--- a/src/main/java/org/gnunet/construct/UInt32.java
+++ b/src/main/java/org/gnunet/construct/UInt32.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/UInt64.java b/src/main/java/org/gnunet/construct/UInt64.java
index 61bc765..179b994 100644
--- a/src/main/java/org/gnunet/construct/UInt64.java
+++ b/src/main/java/org/gnunet/construct/UInt64.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/UInt8.java b/src/main/java/org/gnunet/construct/UInt8.java
index 5f3fd4b..ad2ced5 100644
--- a/src/main/java/org/gnunet/construct/UInt8.java
+++ b/src/main/java/org/gnunet/construct/UInt8.java
@@ -15,8 +15,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/Union.java b/src/main/java/org/gnunet/construct/Union.java
index 7af6df7..0ad99e6 100644
--- a/src/main/java/org/gnunet/construct/Union.java
+++ b/src/main/java/org/gnunet/construct/Union.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/UnionCase.java b/src/main/java/org/gnunet/construct/UnionCase.java
index 2634e25..1c93363 100644
--- a/src/main/java/org/gnunet/construct/UnionCase.java
+++ b/src/main/java/org/gnunet/construct/UnionCase.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/VariableSizeArray.java b/src/main/java/org/gnunet/construct/VariableSizeArray.java
index a914ae0..63377a7 100644
--- a/src/main/java/org/gnunet/construct/VariableSizeArray.java
+++ b/src/main/java/org/gnunet/construct/VariableSizeArray.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/VariableSizeIntegerArray.java b/src/main/java/org/gnunet/construct/VariableSizeIntegerArray.java
index 06fb8a4..10d57f5 100644
--- a/src/main/java/org/gnunet/construct/VariableSizeIntegerArray.java
+++ b/src/main/java/org/gnunet/construct/VariableSizeIntegerArray.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/VariableSizeString.java b/src/main/java/org/gnunet/construct/VariableSizeString.java
index 5dce26d..82c5644 100644
--- a/src/main/java/org/gnunet/construct/VariableSizeString.java
+++ b/src/main/java/org/gnunet/construct/VariableSizeString.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/ZeroTerminatedString.java b/src/main/java/org/gnunet/construct/ZeroTerminatedString.java
index 5df0b50..78d12f7 100644
--- a/src/main/java/org/gnunet/construct/ZeroTerminatedString.java
+++ b/src/main/java/org/gnunet/construct/ZeroTerminatedString.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/main/java/org/gnunet/construct/package-info.java b/src/main/java/org/gnunet/construct/package-info.java
index 3567be0..0d44ad9 100644
--- a/src/main/java/org/gnunet/construct/package-info.java
+++ b/src/main/java/org/gnunet/construct/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/construct/parsers/DoubleParser.java b/src/main/java/org/gnunet/construct/parsers/DoubleParser.java
index 227cafc..671052c 100644
--- a/src/main/java/org/gnunet/construct/parsers/DoubleParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/DoubleParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/FillParser.java b/src/main/java/org/gnunet/construct/parsers/FillParser.java
index 4775da8..b5c13dd 100644
--- a/src/main/java/org/gnunet/construct/parsers/FillParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/FillParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/FixedSizeArrayParser.java b/src/main/java/org/gnunet/construct/parsers/FixedSizeArrayParser.java
index 1a029b0..4981c79 100644
--- a/src/main/java/org/gnunet/construct/parsers/FixedSizeArrayParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/FixedSizeArrayParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java b/src/main/java/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
index 1e90a2a..c855855 100644
--- a/src/main/java/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/IntegerFillParser.java b/src/main/java/org/gnunet/construct/parsers/IntegerFillParser.java
index d6a406f..d546025 100644
--- a/src/main/java/org/gnunet/construct/parsers/IntegerFillParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/IntegerFillParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/IntegerParser.java b/src/main/java/org/gnunet/construct/parsers/IntegerParser.java
index 027f602..cec8326 100644
--- a/src/main/java/org/gnunet/construct/parsers/IntegerParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/IntegerParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/IntegerUtil.java b/src/main/java/org/gnunet/construct/parsers/IntegerUtil.java
index d3d65e3..511eceb 100644
--- a/src/main/java/org/gnunet/construct/parsers/IntegerUtil.java
+++ b/src/main/java/org/gnunet/construct/parsers/IntegerUtil.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/NestedParser.java b/src/main/java/org/gnunet/construct/parsers/NestedParser.java
index 0aff195..7a520ae 100644
--- a/src/main/java/org/gnunet/construct/parsers/NestedParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/NestedParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/Parser.java b/src/main/java/org/gnunet/construct/parsers/Parser.java
index 5d6c93c..76a7068 100644
--- a/src/main/java/org/gnunet/construct/parsers/Parser.java
+++ b/src/main/java/org/gnunet/construct/parsers/Parser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/SequenceParser.java b/src/main/java/org/gnunet/construct/parsers/SequenceParser.java
index 1a36065..5777eae 100644
--- a/src/main/java/org/gnunet/construct/parsers/SequenceParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/SequenceParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/StringParser.java b/src/main/java/org/gnunet/construct/parsers/StringParser.java
index 357304d..153ce72 100644
--- a/src/main/java/org/gnunet/construct/parsers/StringParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/StringParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/UnionParser.java b/src/main/java/org/gnunet/construct/parsers/UnionParser.java
index 8e4616a..d2b2b89 100644
--- a/src/main/java/org/gnunet/construct/parsers/UnionParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/UnionParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java b/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
index 15a3d36..b5d1f34 100644
--- a/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/VariableSizeIntegerArrayParser.java b/src/main/java/org/gnunet/construct/parsers/VariableSizeIntegerArrayParser.java
index 6a5eb2d..1194d9b 100644
--- a/src/main/java/org/gnunet/construct/parsers/VariableSizeIntegerArrayParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/VariableSizeIntegerArrayParser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java b/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
index 64dddc8..a95a4bb 100644
--- a/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct.parsers;
diff --git a/src/main/java/org/gnunet/construct/parsers/package-info.java b/src/main/java/org/gnunet/construct/parsers/package-info.java
index 157d285..02d9058 100644
--- a/src/main/java/org/gnunet/construct/parsers/package-info.java
+++ b/src/main/java/org/gnunet/construct/parsers/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/core/ConnectHandler.java b/src/main/java/org/gnunet/core/ConnectHandler.java
index 1d8be96..75f314d 100644
--- a/src/main/java/org/gnunet/core/ConnectHandler.java
+++ b/src/main/java/org/gnunet/core/ConnectHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/Core.java b/src/main/java/org/gnunet/core/Core.java
index 2c0545f..4cca3ce 100644
--- a/src/main/java/org/gnunet/core/Core.java
+++ b/src/main/java/org/gnunet/core/Core.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/DisconnectHandler.java b/src/main/java/org/gnunet/core/DisconnectHandler.java
index a4bc592..87182d2 100644
--- a/src/main/java/org/gnunet/core/DisconnectHandler.java
+++ b/src/main/java/org/gnunet/core/DisconnectHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/HeaderNotify.java b/src/main/java/org/gnunet/core/HeaderNotify.java
index faec076..784c526 100644
--- a/src/main/java/org/gnunet/core/HeaderNotify.java
+++ b/src/main/java/org/gnunet/core/HeaderNotify.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/InitCallback.java b/src/main/java/org/gnunet/core/InitCallback.java
index aefd00c..a5bc536 100644
--- a/src/main/java/org/gnunet/core/InitCallback.java
+++ b/src/main/java/org/gnunet/core/InitCallback.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/MessageNotify.java b/src/main/java/org/gnunet/core/MessageNotify.java
index 7a8aeab..35265b8 100644
--- a/src/main/java/org/gnunet/core/MessageNotify.java
+++ b/src/main/java/org/gnunet/core/MessageNotify.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
index f63a40c..69ade03 100644
--- a/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
index 3eefd8d..c203cb2 100644
--- a/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/InitMessage.java b/src/main/java/org/gnunet/core/messages/InitMessage.java
index ca75093..5fb2650 100644
--- a/src/main/java/org/gnunet/core/messages/InitMessage.java
+++ b/src/main/java/org/gnunet/core/messages/InitMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/InitReplyMessage.java b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
index 7da1be0..281c8a4 100644
--- a/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
+++ b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
index 775c69f..656ee9d 100644
--- a/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
+++ b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
index 0b63729..1377e43 100644
--- a/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
+++ b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/SendMessage.java b/src/main/java/org/gnunet/core/messages/SendMessage.java
index 49d8231..4245b1c 100644
--- a/src/main/java/org/gnunet/core/messages/SendMessage.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/SendMessageReady.java b/src/main/java/org/gnunet/core/messages/SendMessageReady.java
index 5397374..f92429d 100644
--- a/src/main/java/org/gnunet/core/messages/SendMessageReady.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessageReady.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/messages/SendMessageRequest.java b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
index 9188a29..80835e1 100644
--- a/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
+++ b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core.messages;
diff --git a/src/main/java/org/gnunet/core/package-info.java b/src/main/java/org/gnunet/core/package-info.java
index 3f41b53..f85145d 100644
--- a/src/main/java/org/gnunet/core/package-info.java
+++ b/src/main/java/org/gnunet/core/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/dht/BlockType.java b/src/main/java/org/gnunet/dht/BlockType.java
index c1f6e6f..8ba0211 100644
--- a/src/main/java/org/gnunet/dht/BlockType.java
+++ b/src/main/java/org/gnunet/dht/BlockType.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/DistributedHashTable.java b/src/main/java/org/gnunet/dht/DistributedHashTable.java
index 479904f..a44f7c9 100644
--- a/src/main/java/org/gnunet/dht/DistributedHashTable.java
+++ b/src/main/java/org/gnunet/dht/DistributedHashTable.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/MonitorGetHandler.java b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
index 430dd32..bf81761 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetHandler.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java b/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java
index 542a789..0c358b8 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetResponseHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/MonitorPutHandler.java b/src/main/java/org/gnunet/dht/MonitorPutHandler.java
index f9a5be5..12c7886 100644
--- a/src/main/java/org/gnunet/dht/MonitorPutHandler.java
+++ b/src/main/java/org/gnunet/dht/MonitorPutHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/ResultCallback.java b/src/main/java/org/gnunet/dht/ResultCallback.java
index 067ac38..5caa926 100644
--- a/src/main/java/org/gnunet/dht/ResultCallback.java
+++ b/src/main/java/org/gnunet/dht/ResultCallback.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/RouteOption.java b/src/main/java/org/gnunet/dht/RouteOption.java
index 642b93d..d83ebf3 100644
--- a/src/main/java/org/gnunet/dht/RouteOption.java
+++ b/src/main/java/org/gnunet/dht/RouteOption.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
index be54536..bd9310f 100644
--- a/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
index 87cb3e0..a4d3189 100644
--- a/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
index d996b77..c695087 100644
--- a/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
index 68ef09d..2d6fcf4 100644
--- a/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
index 30a9f88..ecc9aa5 100644
--- a/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
index a57a0f8..42b6c2d 100644
--- a/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
index 335adea..138ba0d 100644
--- a/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
index 2ad9efc..c268866 100644
--- a/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
index 4624597..60259f7 100644
--- a/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
+++ b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht.messages;
diff --git a/src/main/java/org/gnunet/dht/package-info.java b/src/main/java/org/gnunet/dht/package-info.java
index 25275c1..83c6e0b 100644
--- a/src/main/java/org/gnunet/dht/package-info.java
+++ b/src/main/java/org/gnunet/dht/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/gns/Gns.java b/src/main/java/org/gnunet/gns/Gns.java
index b67486b..e62dd7c 100644
--- a/src/main/java/org/gnunet/gns/Gns.java
+++ b/src/main/java/org/gnunet/gns/Gns.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns;
diff --git a/src/main/java/org/gnunet/gns/GnsRecord.java b/src/main/java/org/gnunet/gns/GnsRecord.java
index e58d9d4..2548886 100644
--- a/src/main/java/org/gnunet/gns/GnsRecord.java
+++ b/src/main/java/org/gnunet/gns/GnsRecord.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/gns/LookupResultProcessor.java b/src/main/java/org/gnunet/gns/LookupResultProcessor.java
index d1c0ff2..180050c 100644
--- a/src/main/java/org/gnunet/gns/LookupResultProcessor.java
+++ b/src/main/java/org/gnunet/gns/LookupResultProcessor.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns;
diff --git a/src/main/java/org/gnunet/gns/RecordFlags.java b/src/main/java/org/gnunet/gns/RecordFlags.java
index 8eb1c1a..cb8056f 100644
--- a/src/main/java/org/gnunet/gns/RecordFlags.java
+++ b/src/main/java/org/gnunet/gns/RecordFlags.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns;
diff --git a/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java b/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
index f489ba5..00286bd 100644
--- a/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
+++ b/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns.messages;
diff --git a/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java b/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
index 3676151..339265c 100644
--- a/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
+++ b/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns.messages;
diff --git a/src/main/java/org/gnunet/gns/package-info.java b/src/main/java/org/gnunet/gns/package-info.java
index be2afb8..432759d 100644
--- a/src/main/java/org/gnunet/gns/package-info.java
+++ b/src/main/java/org/gnunet/gns/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/gns/records/ARecordData.java b/src/main/java/org/gnunet/gns/records/ARecordData.java
index 799d3a4..27776f3 100644
--- a/src/main/java/org/gnunet/gns/records/ARecordData.java
+++ b/src/main/java/org/gnunet/gns/records/ARecordData.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns.records;
diff --git a/src/main/java/org/gnunet/gns/records/RecordData.java b/src/main/java/org/gnunet/gns/records/RecordData.java
index c5d591b..0bc6213 100644
--- a/src/main/java/org/gnunet/gns/records/RecordData.java
+++ b/src/main/java/org/gnunet/gns/records/RecordData.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns.records;
diff --git a/src/main/java/org/gnunet/gns/records/UnknownRecordData.java b/src/main/java/org/gnunet/gns/records/UnknownRecordData.java
index 4f7e5e8..0e8359f 100644
--- a/src/main/java/org/gnunet/gns/records/UnknownRecordData.java
+++ b/src/main/java/org/gnunet/gns/records/UnknownRecordData.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.gns.records;
diff --git a/src/main/java/org/gnunet/gns/records/package-info.java b/src/main/java/org/gnunet/gns/records/package-info.java
index 432faee..0085b2c 100644
--- a/src/main/java/org/gnunet/gns/records/package-info.java
+++ b/src/main/java/org/gnunet/gns/records/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/hello/HelloMessage.java b/src/main/java/org/gnunet/hello/HelloMessage.java
index c33b359..5a17427 100644
--- a/src/main/java/org/gnunet/hello/HelloMessage.java
+++ b/src/main/java/org/gnunet/hello/HelloMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.hello;
diff --git a/src/main/java/org/gnunet/hello/package-info.java b/src/main/java/org/gnunet/hello/package-info.java
index a3bfe11..60d3c0e 100644
--- a/src/main/java/org/gnunet/hello/package-info.java
+++ b/src/main/java/org/gnunet/hello/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/identity/Identity.java b/src/main/java/org/gnunet/identity/Identity.java
index 901bd4c..1a8eb8e 100644
--- a/src/main/java/org/gnunet/identity/Identity.java
+++ b/src/main/java/org/gnunet/identity/Identity.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity;
diff --git a/src/main/java/org/gnunet/identity/IdentityCallback.java b/src/main/java/org/gnunet/identity/IdentityCallback.java
index 4814977..6e24a4a 100644
--- a/src/main/java/org/gnunet/identity/IdentityCallback.java
+++ b/src/main/java/org/gnunet/identity/IdentityCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity;
diff --git a/src/main/java/org/gnunet/identity/IdentityContinuation.java b/src/main/java/org/gnunet/identity/IdentityContinuation.java
index 1aa15f6..06893af 100644
--- a/src/main/java/org/gnunet/identity/IdentityContinuation.java
+++ b/src/main/java/org/gnunet/identity/IdentityContinuation.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity;
diff --git a/src/main/java/org/gnunet/identity/IdentityListCallback.java b/src/main/java/org/gnunet/identity/IdentityListCallback.java
index ecc26ba..2f92f09 100644
--- a/src/main/java/org/gnunet/identity/IdentityListCallback.java
+++ b/src/main/java/org/gnunet/identity/IdentityListCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity;
diff --git a/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java b/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
index 8f48ee6..e02eb6a 100644
--- a/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/DeleteMessage.java b/src/main/java/org/gnunet/identity/messages/DeleteMessage.java
index 9d72a43..e56379c 100644
--- a/src/main/java/org/gnunet/identity/messages/DeleteMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/DeleteMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java b/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
index 83d3890..77d5076 100644
--- a/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -74,8 +74,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/RenameMessage.java b/src/main/java/org/gnunet/identity/messages/RenameMessage.java
index d02f95d..1e8dce6 100644
--- a/src/main/java/org/gnunet/identity/messages/RenameMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/RenameMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
index 7e13f75..a30c4c2 100644
--- a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -74,8 +74,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -94,8 +94,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java b/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
index 1d1f6a0..e329753 100644
--- a/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/StartMessage.java b/src/main/java/org/gnunet/identity/messages/StartMessage.java
index 42787a2..8b542a1 100644
--- a/src/main/java/org/gnunet/identity/messages/StartMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/StartMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java b/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
index f2e904d..a1f436d 100644
--- a/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -74,8 +74,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity.messages;
diff --git a/src/main/java/org/gnunet/identity/package-info.java b/src/main/java/org/gnunet/identity/package-info.java
index 41bfe8c..2d73ced 100644
--- a/src/main/java/org/gnunet/identity/package-info.java
+++ b/src/main/java/org/gnunet/identity/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/mq/package-info.java b/src/main/java/org/gnunet/mq/package-info.java
index 38f0485..1e354bf 100644
--- a/src/main/java/org/gnunet/mq/package-info.java
+++ b/src/main/java/org/gnunet/mq/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java b/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
index ad276cd..ebaffec 100644
--- a/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
+++ b/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.nse;
diff --git a/src/main/java/org/gnunet/nse/package-info.java b/src/main/java/org/gnunet/nse/package-info.java
index cce27cf..a73e197 100644
--- a/src/main/java/org/gnunet/nse/package-info.java
+++ b/src/main/java/org/gnunet/nse/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/peerinfo/PeerInfo.java b/src/main/java/org/gnunet/peerinfo/PeerInfo.java
index 03e52c3..930bc06 100644
--- a/src/main/java/org/gnunet/peerinfo/PeerInfo.java
+++ b/src/main/java/org/gnunet/peerinfo/PeerInfo.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerinfo;
diff --git a/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
index 3c7e545..0c95bf2 100644
--- a/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerinfo.messages;
diff --git a/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
index 05c8abc..e7050d0 100644
--- a/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerinfo.messages;
diff --git a/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
index e360bf4..dffbeb0 100644
--- a/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerinfo.messages;
diff --git a/src/main/java/org/gnunet/peerinfo/package-info.java b/src/main/java/org/gnunet/peerinfo/package-info.java
index 3c10576..58a887a 100644
--- a/src/main/java/org/gnunet/peerinfo/package-info.java
+++ b/src/main/java/org/gnunet/peerinfo/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/peerstore/IterateRequest.java b/src/main/java/org/gnunet/peerstore/IterateRequest.java
index 38a53c9..b8de850 100644
--- a/src/main/java/org/gnunet/peerstore/IterateRequest.java
+++ b/src/main/java/org/gnunet/peerstore/IterateRequest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore;
diff --git a/src/main/java/org/gnunet/peerstore/Peerstore.java b/src/main/java/org/gnunet/peerstore/Peerstore.java
index a111005..328c6cb 100644
--- a/src/main/java/org/gnunet/peerstore/Peerstore.java
+++ b/src/main/java/org/gnunet/peerstore/Peerstore.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore;
diff --git a/src/main/java/org/gnunet/peerstore/PeerstoreReceiver.java b/src/main/java/org/gnunet/peerstore/PeerstoreReceiver.java
index 0688337..c34c7c3 100644
--- a/src/main/java/org/gnunet/peerstore/PeerstoreReceiver.java
+++ b/src/main/java/org/gnunet/peerstore/PeerstoreReceiver.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore;
diff --git a/src/main/java/org/gnunet/peerstore/StoreOption.java b/src/main/java/org/gnunet/peerstore/StoreOption.java
index d7d0960..0bebd44 100644
--- a/src/main/java/org/gnunet/peerstore/StoreOption.java
+++ b/src/main/java/org/gnunet/peerstore/StoreOption.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore;
diff --git a/src/main/java/org/gnunet/peerstore/WatchRequest.java b/src/main/java/org/gnunet/peerstore/WatchRequest.java
index e51fe42..35056cd 100644
--- a/src/main/java/org/gnunet/peerstore/WatchRequest.java
+++ b/src/main/java/org/gnunet/peerstore/WatchRequest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore;
diff --git a/src/main/java/org/gnunet/peerstore/messages/IterateEndMessage.java b/src/main/java/org/gnunet/peerstore/messages/IterateEndMessage.java
index c49d783..0a01c53 100644
--- a/src/main/java/org/gnunet/peerstore/messages/IterateEndMessage.java
+++ b/src/main/java/org/gnunet/peerstore/messages/IterateEndMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore.messages;
diff --git a/src/main/java/org/gnunet/peerstore/messages/IterateMessage.java b/src/main/java/org/gnunet/peerstore/messages/IterateMessage.java
index 7269564..5fd010d 100644
--- a/src/main/java/org/gnunet/peerstore/messages/IterateMessage.java
+++ b/src/main/java/org/gnunet/peerstore/messages/IterateMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore.messages;
diff --git a/src/main/java/org/gnunet/peerstore/messages/IterateRecordMessage.java b/src/main/java/org/gnunet/peerstore/messages/IterateRecordMessage.java
index 9fa6c86..6ce5578 100644
--- a/src/main/java/org/gnunet/peerstore/messages/IterateRecordMessage.java
+++ b/src/main/java/org/gnunet/peerstore/messages/IterateRecordMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore.messages;
diff --git a/src/main/java/org/gnunet/peerstore/messages/StoreMessage.java b/src/main/java/org/gnunet/peerstore/messages/StoreMessage.java
index c150b90..a5de8ec 100644
--- a/src/main/java/org/gnunet/peerstore/messages/StoreMessage.java
+++ b/src/main/java/org/gnunet/peerstore/messages/StoreMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.peerstore.messages;
diff --git a/src/main/java/org/gnunet/requests/FixedMessageRequest.java b/src/main/java/org/gnunet/requests/FixedMessageRequest.java
index 4491951..0d81e67 100644
--- a/src/main/java/org/gnunet/requests/FixedMessageRequest.java
+++ b/src/main/java/org/gnunet/requests/FixedMessageRequest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
index 652031f..1492d94 100644
--- a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
+++ b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/requests/Request.java b/src/main/java/org/gnunet/requests/Request.java
index e4d1370..c16a103 100644
--- a/src/main/java/org/gnunet/requests/Request.java
+++ b/src/main/java/org/gnunet/requests/Request.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -54,8 +54,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -74,8 +74,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/RequestContainer.java b/src/main/java/org/gnunet/requests/RequestContainer.java
index e93c25f..0f71a15 100644
--- a/src/main/java/org/gnunet/requests/RequestContainer.java
+++ b/src/main/java/org/gnunet/requests/RequestContainer.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/RequestIdentifier.java b/src/main/java/org/gnunet/requests/RequestIdentifier.java
index e080ecf..0f31275 100644
--- a/src/main/java/org/gnunet/requests/RequestIdentifier.java
+++ b/src/main/java/org/gnunet/requests/RequestIdentifier.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/SequentialRequestContainer.java b/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
index 650529a..ff6b947 100644
--- a/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
+++ b/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/SimpleRequestIdentifier.java b/src/main/java/org/gnunet/requests/SimpleRequestIdentifier.java
index 736a79b..57b1e67 100644
--- a/src/main/java/org/gnunet/requests/SimpleRequestIdentifier.java
+++ b/src/main/java/org/gnunet/requests/SimpleRequestIdentifier.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/TimeoutHandler.java b/src/main/java/org/gnunet/requests/TimeoutHandler.java
index fccbd50..728528c 100644
--- a/src/main/java/org/gnunet/requests/TimeoutHandler.java
+++ b/src/main/java/org/gnunet/requests/TimeoutHandler.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.requests;
diff --git a/src/main/java/org/gnunet/requests/package-info.java b/src/main/java/org/gnunet/requests/package-info.java
index 505e359..2abff03 100644
--- a/src/main/java/org/gnunet/requests/package-info.java
+++ b/src/main/java/org/gnunet/requests/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/secretsharing/Ciphertext.java b/src/main/java/org/gnunet/secretsharing/Ciphertext.java
index 29238d6..a8ed1e2 100644
--- a/src/main/java/org/gnunet/secretsharing/Ciphertext.java
+++ b/src/main/java/org/gnunet/secretsharing/Ciphertext.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/DecryptCallback.java b/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
index 49172b3..b1dd3ca 100644
--- a/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
+++ b/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/Decryption.java b/src/main/java/org/gnunet/secretsharing/Decryption.java
index ad0026a..ff8b38b 100644
--- a/src/main/java/org/gnunet/secretsharing/Decryption.java
+++ b/src/main/java/org/gnunet/secretsharing/Decryption.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/FieldElement.java b/src/main/java/org/gnunet/secretsharing/FieldElement.java
index 6566d8c..0dc4060 100644
--- a/src/main/java/org/gnunet/secretsharing/FieldElement.java
+++ b/src/main/java/org/gnunet/secretsharing/FieldElement.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/KeyGeneration.java b/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
index e76d6b8..3b506d7 100644
--- a/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
+++ b/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/Parameters.java b/src/main/java/org/gnunet/secretsharing/Parameters.java
index 6b78c03..b79fe5a 100644
--- a/src/main/java/org/gnunet/secretsharing/Parameters.java
+++ b/src/main/java/org/gnunet/secretsharing/Parameters.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/Plaintext.java b/src/main/java/org/gnunet/secretsharing/Plaintext.java
index 96af24f..091e34f 100644
--- a/src/main/java/org/gnunet/secretsharing/Plaintext.java
+++ b/src/main/java/org/gnunet/secretsharing/Plaintext.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java b/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
index bf5b436..b7d9c10 100644
--- a/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
+++ b/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/ThresholdPublicKey.java b/src/main/java/org/gnunet/secretsharing/ThresholdPublicKey.java
index 13fc1b1..802f2bd 100644
--- a/src/main/java/org/gnunet/secretsharing/ThresholdPublicKey.java
+++ b/src/main/java/org/gnunet/secretsharing/ThresholdPublicKey.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java b/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
index 555dfda..7826712 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing.messages;
diff --git a/src/main/java/org/gnunet/secretsharing/messages/DecryptDoneMessage.java b/src/main/java/org/gnunet/secretsharing/messages/DecryptDoneMessage.java
index 77d72bf..374e664 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/DecryptDoneMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/DecryptDoneMessage.java
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNUnet; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing.messages;
diff --git a/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java b/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
index 754b688..f5c09b1 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNUnet; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
  */
 
diff --git a/src/main/java/org/gnunet/secretsharing/messages/SecretReadyMessage.java b/src/main/java/org/gnunet/secretsharing/messages/SecretReadyMessage.java
index 7675008..88b555e 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/SecretReadyMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/SecretReadyMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing.messages;
diff --git a/src/main/java/org/gnunet/secretsharing/package-info.java b/src/main/java/org/gnunet/secretsharing/package-info.java
index f12ed15..c8ab754 100644
--- a/src/main/java/org/gnunet/secretsharing/package-info.java
+++ b/src/main/java/org/gnunet/secretsharing/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/statistics/Statistics.java b/src/main/java/org/gnunet/statistics/Statistics.java
index 123f7f9..b0c08dc 100644
--- a/src/main/java/org/gnunet/statistics/Statistics.java
+++ b/src/main/java/org/gnunet/statistics/Statistics.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics;
diff --git a/src/main/java/org/gnunet/statistics/StatisticsReceiver.java b/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
index f884696..7a2aa2e 100644
--- a/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
+++ b/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics;
diff --git a/src/main/java/org/gnunet/statistics/messages/GetMessage.java b/src/main/java/org/gnunet/statistics/messages/GetMessage.java
index a433cca..9040409 100644
--- a/src/main/java/org/gnunet/statistics/messages/GetMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/GetMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java b/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
index cc57d5b..cf14680 100644
--- a/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java b/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
index 53a1726..6283a6b 100644
--- a/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/messages/SetMessage.java b/src/main/java/org/gnunet/statistics/messages/SetMessage.java
index 13c169b..f28defb 100644
--- a/src/main/java/org/gnunet/statistics/messages/SetMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/SetMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/messages/WatchMessage.java b/src/main/java/org/gnunet/statistics/messages/WatchMessage.java
index e1fc37b..d342f9e 100644
--- a/src/main/java/org/gnunet/statistics/messages/WatchMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/WatchMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java b/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
index 0c40aca..6f222bf 100644
--- a/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
+++ b/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics.messages;
diff --git a/src/main/java/org/gnunet/statistics/package-info.java b/src/main/java/org/gnunet/statistics/package-info.java
index 9a5b589..061d37a 100644
--- a/src/main/java/org/gnunet/statistics/package-info.java
+++ b/src/main/java/org/gnunet/statistics/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/testbed/CompressedConfig.java b/src/main/java/org/gnunet/testbed/CompressedConfig.java
index 5c82b9f..e3d5fd5 100644
--- a/src/main/java/org/gnunet/testbed/CompressedConfig.java
+++ b/src/main/java/org/gnunet/testbed/CompressedConfig.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 package org.gnunet.testbed;
 
diff --git a/src/main/java/org/gnunet/testbed/Controller.java b/src/main/java/org/gnunet/testbed/Controller.java
index e855033..eb666a8 100644
--- a/src/main/java/org/gnunet/testbed/Controller.java
+++ b/src/main/java/org/gnunet/testbed/Controller.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 package org.gnunet.testbed;
 
diff --git a/src/main/java/org/gnunet/testbed/PeerInformationCallback.java b/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
index 29fb8a4..ead0928 100644
--- a/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
+++ b/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed;
diff --git a/src/main/java/org/gnunet/testbed/ServiceAdapter.java b/src/main/java/org/gnunet/testbed/ServiceAdapter.java
index 6f3be69..50132ba 100644
--- a/src/main/java/org/gnunet/testbed/ServiceAdapter.java
+++ b/src/main/java/org/gnunet/testbed/ServiceAdapter.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed;
diff --git a/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java b/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
index ab4ae97..9794518 100644
--- a/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed.messages;
diff --git a/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java b/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
index b28cf3f..b3a8b77 100644
--- a/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 package org.gnunet.testbed.messages;
 
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java
index 8c3d519..905db1f 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed.messages;
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java
index 5866de6..f119259 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed.messages;
diff --git a/src/main/java/org/gnunet/testbed/package-info.java b/src/main/java/org/gnunet/testbed/package-info.java
index a86515f..b6d6303 100644
--- a/src/main/java/org/gnunet/testbed/package-info.java
+++ b/src/main/java/org/gnunet/testbed/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/testing/TestingSetup.java b/src/main/java/org/gnunet/testing/TestingSetup.java
index 7a1d967..e1898a3 100644
--- a/src/main/java/org/gnunet/testing/TestingSetup.java
+++ b/src/main/java/org/gnunet/testing/TestingSetup.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testing;
diff --git a/src/main/java/org/gnunet/testing/TestingSubsystem.java b/src/main/java/org/gnunet/testing/TestingSubsystem.java
index 2a3eef0..a72ce2a 100644
--- a/src/main/java/org/gnunet/testing/TestingSubsystem.java
+++ b/src/main/java/org/gnunet/testing/TestingSubsystem.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testing;
diff --git a/src/main/java/org/gnunet/testing/package-info.java b/src/main/java/org/gnunet/testing/package-info.java
index 00510e9..8f48694 100644
--- a/src/main/java/org/gnunet/testing/package-info.java
+++ b/src/main/java/org/gnunet/testing/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/transport/AddressQuery.java b/src/main/java/org/gnunet/transport/AddressQuery.java
index 414e195..1da32e2 100644
--- a/src/main/java/org/gnunet/transport/AddressQuery.java
+++ b/src/main/java/org/gnunet/transport/AddressQuery.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/BlacklistCallback.java b/src/main/java/org/gnunet/transport/BlacklistCallback.java
index 3fadf2d..c66cd98 100644
--- a/src/main/java/org/gnunet/transport/BlacklistCallback.java
+++ b/src/main/java/org/gnunet/transport/BlacklistCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/HelloAddress.java b/src/main/java/org/gnunet/transport/HelloAddress.java
index 0d24488..698d139 100644
--- a/src/main/java/org/gnunet/transport/HelloAddress.java
+++ b/src/main/java/org/gnunet/transport/HelloAddress.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/OfferHelloContinuation.java b/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
index 1a47242..9bc1aa5 100644
--- a/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
+++ b/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/PeerAddressListCallback.java b/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
index 0b49b32..40b697d 100644
--- a/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
+++ b/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java b/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
index 0a5fb67..a87a147 100644
--- a/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
+++ b/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/PeerState.java b/src/main/java/org/gnunet/transport/PeerState.java
index 8c1c683..90f856a 100644
--- a/src/main/java/org/gnunet/transport/PeerState.java
+++ b/src/main/java/org/gnunet/transport/PeerState.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
index 200554a..d74b453 100644
--- a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport.messages;
diff --git a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
index 742f510..2568dde 100644
--- a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
+++ b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport.messages;
diff --git a/src/main/java/org/gnunet/transport/messages/ConnectMessage.java b/src/main/java/org/gnunet/transport/messages/ConnectMessage.java
index 436ba2a..3588055 100644
--- a/src/main/java/org/gnunet/transport/messages/ConnectMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/ConnectMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 package org.gnunet.transport.messages;
 
diff --git a/src/main/java/org/gnunet/transport/messages/DisconnectMessage.java b/src/main/java/org/gnunet/transport/messages/DisconnectMessage.java
index 4824e86..f4cfa0e 100644
--- a/src/main/java/org/gnunet/transport/messages/DisconnectMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/DisconnectMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 package org.gnunet.transport.messages;
 
diff --git a/src/main/java/org/gnunet/transport/messages/RecvMessage.java b/src/main/java/org/gnunet/transport/messages/RecvMessage.java
index c99f675..79444c3 100644
--- a/src/main/java/org/gnunet/transport/messages/RecvMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/RecvMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 package org.gnunet.transport.messages;
 
diff --git a/src/main/java/org/gnunet/transport/messages/SetQuotaMessage.java b/src/main/java/org/gnunet/transport/messages/SetQuotaMessage.java
index 55ece30..c95d673 100644
--- a/src/main/java/org/gnunet/transport/messages/SetQuotaMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/SetQuotaMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport.messages;
diff --git a/src/main/java/org/gnunet/transport/messages/StartMessage.java b/src/main/java/org/gnunet/transport/messages/StartMessage.java
index c3fdf44..7da69e0 100644
--- a/src/main/java/org/gnunet/transport/messages/StartMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/StartMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 package org.gnunet.transport.messages;
 
diff --git a/src/main/java/org/gnunet/transport/package-info.java b/src/main/java/org/gnunet/transport/package-info.java
index 3814925..c89814a 100644
--- a/src/main/java/org/gnunet/transport/package-info.java
+++ b/src/main/java/org/gnunet/transport/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/util/ATSInformation.java b/src/main/java/org/gnunet/util/ATSInformation.java
index fd0d477..db6c61c 100644
--- a/src/main/java/org/gnunet/util/ATSInformation.java
+++ b/src/main/java/org/gnunet/util/ATSInformation.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/AbsoluteTime.java b/src/main/java/org/gnunet/util/AbsoluteTime.java
index bc4e2f4..f332868 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTime.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTime.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java b/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
index 9b27449..968fbe3 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/BigIntegers.java b/src/main/java/org/gnunet/util/BigIntegers.java
index ae78e49..3a1b103 100644
--- a/src/main/java/org/gnunet/util/BigIntegers.java
+++ b/src/main/java/org/gnunet/util/BigIntegers.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Cancelable.java b/src/main/java/org/gnunet/util/Cancelable.java
index 16e1d06..9ba6634 100644
--- a/src/main/java/org/gnunet/util/Cancelable.java
+++ b/src/main/java/org/gnunet/util/Cancelable.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/CancellationToken.java b/src/main/java/org/gnunet/util/CancellationToken.java
index b0ffa5c..e7c1b5d 100644
--- a/src/main/java/org/gnunet/util/CancellationToken.java
+++ b/src/main/java/org/gnunet/util/CancellationToken.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Client.java b/src/main/java/org/gnunet/util/Client.java
index 6da6859..43b4584 100644
--- a/src/main/java/org/gnunet/util/Client.java
+++ b/src/main/java/org/gnunet/util/Client.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 package org.gnunet.util;
 
diff --git a/src/main/java/org/gnunet/util/Configuration.java b/src/main/java/org/gnunet/util/Configuration.java
index af98201..7a223a9 100644
--- a/src/main/java/org/gnunet/util/Configuration.java
+++ b/src/main/java/org/gnunet/util/Configuration.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Connection.java b/src/main/java/org/gnunet/util/Connection.java
index 77b8e08..e3e6a19 100644
--- a/src/main/java/org/gnunet/util/Connection.java
+++ b/src/main/java/org/gnunet/util/Connection.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Continuation.java b/src/main/java/org/gnunet/util/Continuation.java
index 7e184e8..b456ced 100644
--- a/src/main/java/org/gnunet/util/Continuation.java
+++ b/src/main/java/org/gnunet/util/Continuation.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/GnunetMessage.java b/src/main/java/org/gnunet/util/GnunetMessage.java
index 35667f0..798c413 100644
--- a/src/main/java/org/gnunet/util/GnunetMessage.java
+++ b/src/main/java/org/gnunet/util/GnunetMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/HashCode.java b/src/main/java/org/gnunet/util/HashCode.java
index 9575f5c..8c678e8 100644
--- a/src/main/java/org/gnunet/util/HashCode.java
+++ b/src/main/java/org/gnunet/util/HashCode.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Helper.java b/src/main/java/org/gnunet/util/Helper.java
index 2876e81..0c3c810 100644
--- a/src/main/java/org/gnunet/util/Helper.java
+++ b/src/main/java/org/gnunet/util/Helper.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 package org.gnunet.util;
 
diff --git a/src/main/java/org/gnunet/util/MessageReceiver.java b/src/main/java/org/gnunet/util/MessageReceiver.java
index a7aaa4e..d83baa7 100644
--- a/src/main/java/org/gnunet/util/MessageReceiver.java
+++ b/src/main/java/org/gnunet/util/MessageReceiver.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
index ad6c96b..2114ca0 100644
--- a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
+++ b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/MessageTransmitter.java b/src/main/java/org/gnunet/util/MessageTransmitter.java
index afb28f4..eea014f 100644
--- a/src/main/java/org/gnunet/util/MessageTransmitter.java
+++ b/src/main/java/org/gnunet/util/MessageTransmitter.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/MstCalllback.java b/src/main/java/org/gnunet/util/MstCalllback.java
index 84af6e6..138eb1b 100644
--- a/src/main/java/org/gnunet/util/MstCalllback.java
+++ b/src/main/java/org/gnunet/util/MstCalllback.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/PeerIdentity.java b/src/main/java/org/gnunet/util/PeerIdentity.java
index f9dfb4e..7603d33 100644
--- a/src/main/java/org/gnunet/util/PeerIdentity.java
+++ b/src/main/java/org/gnunet/util/PeerIdentity.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Program.java b/src/main/java/org/gnunet/util/Program.java
index 34ee01e..91adaff 100644
--- a/src/main/java/org/gnunet/util/Program.java
+++ b/src/main/java/org/gnunet/util/Program.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java
index 423a397..4c38b67 100644
--- a/src/main/java/org/gnunet/util/RelativeTime.java
+++ b/src/main/java/org/gnunet/util/RelativeTime.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/RelativeTimeMessage.java b/src/main/java/org/gnunet/util/RelativeTimeMessage.java
index 0c0b138..37d2a48 100644
--- a/src/main/java/org/gnunet/util/RelativeTimeMessage.java
+++ b/src/main/java/org/gnunet/util/RelativeTimeMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Resolver.java b/src/main/java/org/gnunet/util/Resolver.java
index 8cefa8e..03709a7 100644
--- a/src/main/java/org/gnunet/util/Resolver.java
+++ b/src/main/java/org/gnunet/util/Resolver.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
index aa441be..5321ed9 100644
--- a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
+++ b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/RunaboutUtil.java b/src/main/java/org/gnunet/util/RunaboutUtil.java
index 199168b..4c203aa 100644
--- a/src/main/java/org/gnunet/util/RunaboutUtil.java
+++ b/src/main/java/org/gnunet/util/RunaboutUtil.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Scheduler.java b/src/main/java/org/gnunet/util/Scheduler.java
index 11d682c..9462f47 100644
--- a/src/main/java/org/gnunet/util/Scheduler.java
+++ b/src/main/java/org/gnunet/util/Scheduler.java
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Server.java b/src/main/java/org/gnunet/util/Server.java
index 4cf8dd2..cdfddc5 100644
--- a/src/main/java/org/gnunet/util/Server.java
+++ b/src/main/java/org/gnunet/util/Server.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Service.java b/src/main/java/org/gnunet/util/Service.java
index b1fdc94..4e8380a 100644
--- a/src/main/java/org/gnunet/util/Service.java
+++ b/src/main/java/org/gnunet/util/Service.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/Strings.java b/src/main/java/org/gnunet/util/Strings.java
index b97eb0d..e778081 100644
--- a/src/main/java/org/gnunet/util/Strings.java
+++ b/src/main/java/org/gnunet/util/Strings.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/TestMessage.java b/src/main/java/org/gnunet/util/TestMessage.java
index a9e9dfb..8718e06 100644
--- a/src/main/java/org/gnunet/util/TestMessage.java
+++ b/src/main/java/org/gnunet/util/TestMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/UnknownMessageBody.java b/src/main/java/org/gnunet/util/UnknownMessageBody.java
index e0bba75..18d52fb 100644
--- a/src/main/java/org/gnunet/util/UnknownMessageBody.java
+++ b/src/main/java/org/gnunet/util/UnknownMessageBody.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/main/java/org/gnunet/util/crypto/DsaPrng.java b/src/main/java/org/gnunet/util/crypto/DsaPrng.java
index ddc7963..34a65c4 100644
--- a/src/main/java/org/gnunet/util/crypto/DsaPrng.java
+++ b/src/main/java/org/gnunet/util/crypto/DsaPrng.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
index 815e24c..9782bc1 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java b/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
index db41e61..d44753d 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
index 1e5e3e7..72a7e9e 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
index cee23d3..fd3134f 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
index e4cf940..204ab9e 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
index bcca46d..f7c8c80 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/Ed25519.java b/src/main/java/org/gnunet/util/crypto/Ed25519.java
index 686cb43..29f0c44 100644
--- a/src/main/java/org/gnunet/util/crypto/Ed25519.java
+++ b/src/main/java/org/gnunet/util/crypto/Ed25519.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
index 1a5e33a..a1bb208 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 package org.gnunet.util.crypto;
 
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
index fe03743..317fef2 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignature.java b/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
index 5a31d94..c08fbd6 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
index 21f1b78..2066346 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.crypto;
diff --git a/src/main/java/org/gnunet/util/crypto/package-info.java b/src/main/java/org/gnunet/util/crypto/package-info.java
index 4d2b082..b249335 100644
--- a/src/main/java/org/gnunet/util/crypto/package-info.java
+++ b/src/main/java/org/gnunet/util/crypto/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/gnunet/util/getopt/Argument.java b/src/main/java/org/gnunet/util/getopt/Argument.java
index 7183862..254dfa8 100644
--- a/src/main/java/org/gnunet/util/getopt/Argument.java
+++ b/src/main/java/org/gnunet/util/getopt/Argument.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.getopt;
diff --git a/src/main/java/org/gnunet/util/getopt/ArgumentAction.java b/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
index ffefdf2..22af8f0 100644
--- a/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
+++ b/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.getopt;
diff --git a/src/main/java/org/gnunet/util/getopt/Parser.java b/src/main/java/org/gnunet/util/getopt/Parser.java
index ba47a9f..88f19bb 100644
--- a/src/main/java/org/gnunet/util/getopt/Parser.java
+++ b/src/main/java/org/gnunet/util/getopt/Parser.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.getopt;
diff --git a/src/main/java/org/gnunet/util/getopt/package-info.java b/src/main/java/org/gnunet/util/getopt/package-info.java
index 14a77ce..329d81c 100644
--- a/src/main/java/org/gnunet/util/getopt/package-info.java
+++ b/src/main/java/org/gnunet/util/getopt/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/util/package-info.java b/src/main/java/org/gnunet/util/package-info.java
index 002b1f5..0386576 100644
--- a/src/main/java/org/gnunet/util/package-info.java
+++ b/src/main/java/org/gnunet/util/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 /**
diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
index 2cc8da7..920ae64 100644
--- a/src/main/java/org/gnunet/voting/Ballot.java
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index 4f85289..a1f8991 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/CertifyGroupTool.java b/src/main/java/org/gnunet/voting/CertifyGroupTool.java
index f6d10f3..57efc77 100644
--- a/src/main/java/org/gnunet/voting/CertifyGroupTool.java
+++ b/src/main/java/org/gnunet/voting/CertifyGroupTool.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/ChaumPedersenZkp.java b/src/main/java/org/gnunet/voting/ChaumPedersenZkp.java
index 3d8f0ed..db8e063 100644
--- a/src/main/java/org/gnunet/voting/ChaumPedersenZkp.java
+++ b/src/main/java/org/gnunet/voting/ChaumPedersenZkp.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/DisjunctionZkp.java b/src/main/java/org/gnunet/voting/DisjunctionZkp.java
index b34c4a9..0d3f951 100644
--- a/src/main/java/org/gnunet/voting/DisjunctionZkp.java
+++ b/src/main/java/org/gnunet/voting/DisjunctionZkp.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/EncryptedVote.java b/src/main/java/org/gnunet/voting/EncryptedVote.java
index 1a38bc0..5a9a1fa 100644
--- a/src/main/java/org/gnunet/voting/EncryptedVote.java
+++ b/src/main/java/org/gnunet/voting/EncryptedVote.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/GroupCert.java b/src/main/java/org/gnunet/voting/GroupCert.java
index 1952f4f..b59a01e 100644
--- a/src/main/java/org/gnunet/voting/GroupCert.java
+++ b/src/main/java/org/gnunet/voting/GroupCert.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/InvalidBallotException.java b/src/main/java/org/gnunet/voting/InvalidBallotException.java
index b016623..91ba065 100644
--- a/src/main/java/org/gnunet/voting/InvalidBallotException.java
+++ b/src/main/java/org/gnunet/voting/InvalidBallotException.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/InvalidGroupCertException.java b/src/main/java/org/gnunet/voting/InvalidGroupCertException.java
index a0b5b12..93aca9b 100644
--- a/src/main/java/org/gnunet/voting/InvalidGroupCertException.java
+++ b/src/main/java/org/gnunet/voting/InvalidGroupCertException.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -34,8 +34,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
index 7ca9b4c..b08b005 100644
--- a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
+++ b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 package org.gnunet.voting;
 
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
index 053b7cf..ea8a0d6 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting.messages;
diff --git a/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java
index 9a2fda3..67deea5 100644
--- a/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting.messages;
diff --git a/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java
index 1715089..1c58754 100644
--- a/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting.messages;
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
index e542ea6..070bc41 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting.messages;
diff --git a/src/main/java/org/gnunet/voting/package-info.java b/src/main/java/org/gnunet/voting/package-info.java
index 2fecad0..8122c07 100644
--- a/src/main/java/org/gnunet/voting/package-info.java
+++ b/src/main/java/org/gnunet/voting/package-info.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/src/main/java/org/grothoff/Runabout.java b/src/main/java/org/grothoff/Runabout.java
index 3122d85..44b25e4 100644
--- a/src/main/java/org/grothoff/Runabout.java
+++ b/src/main/java/org/grothoff/Runabout.java
@@ -9,7 +9,7 @@
  * 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
  * the Runabout; see the file COPYING. If not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  *
  * This software is also licensed under the Eclipse Public License v1.0 
  * available at http://www.eclipse.org/legal/epl-v10.html.
diff --git a/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java b/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
index e950607..bea03c4 100644
--- a/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
+++ b/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java b/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
index fa03d70..b6f7416 100644
--- a/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
+++ b/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.consensus;
diff --git a/src/test/java/org/gnunet/construct/ByteFillMessage.java b/src/test/java/org/gnunet/construct/ByteFillMessage.java
index 247200d..4d5b565 100644
--- a/src/test/java/org/gnunet/construct/ByteFillMessage.java
+++ b/src/test/java/org/gnunet/construct/ByteFillMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/test/java/org/gnunet/construct/QueryMessage.java b/src/test/java/org/gnunet/construct/QueryMessage.java
index 1a8a0fa..496aae8 100644
--- a/src/test/java/org/gnunet/construct/QueryMessage.java
+++ b/src/test/java/org/gnunet/construct/QueryMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/test/java/org/gnunet/construct/StringMessage.java b/src/test/java/org/gnunet/construct/StringMessage.java
index f330162..5d43c27 100644
--- a/src/test/java/org/gnunet/construct/StringMessage.java
+++ b/src/test/java/org/gnunet/construct/StringMessage.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/test/java/org/gnunet/construct/VariableStringTest.java b/src/test/java/org/gnunet/construct/VariableStringTest.java
index 2072155..24c5a55 100644
--- a/src/test/java/org/gnunet/construct/VariableStringTest.java
+++ b/src/test/java/org/gnunet/construct/VariableStringTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.construct;
diff --git a/src/test/java/org/gnunet/core/CoreTest.java b/src/test/java/org/gnunet/core/CoreTest.java
index 86986e3..fd26aab 100644
--- a/src/test/java/org/gnunet/core/CoreTest.java
+++ b/src/test/java/org/gnunet/core/CoreTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.core;
diff --git a/src/test/java/org/gnunet/dht/DHTTest.java b/src/test/java/org/gnunet/dht/DHTTest.java
index 333407e..3952807 100644
--- a/src/test/java/org/gnunet/dht/DHTTest.java
+++ b/src/test/java/org/gnunet/dht/DHTTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.dht;
diff --git a/src/test/java/org/gnunet/identity/IdentityTest.java b/src/test/java/org/gnunet/identity/IdentityTest.java
index dafda40..0d0e654 100644
--- a/src/test/java/org/gnunet/identity/IdentityTest.java
+++ b/src/test/java/org/gnunet/identity/IdentityTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.identity;
diff --git a/src/test/java/org/gnunet/nse/NSETest.java b/src/test/java/org/gnunet/nse/NSETest.java
index 1ecdd64..d8ffed7 100644
--- a/src/test/java/org/gnunet/nse/NSETest.java
+++ b/src/test/java/org/gnunet/nse/NSETest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.nse;
diff --git a/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java b/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
index 91d9f25..14ad009 100644
--- a/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
+++ b/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.secretsharing;
diff --git a/src/test/java/org/gnunet/statistics/StatisticsTest.java b/src/test/java/org/gnunet/statistics/StatisticsTest.java
index 5b6f77c..d79f53f 100644
--- a/src/test/java/org/gnunet/statistics/StatisticsTest.java
+++ b/src/test/java/org/gnunet/statistics/StatisticsTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.statistics;
diff --git a/src/test/java/org/gnunet/testbed/TestbedTest.java b/src/test/java/org/gnunet/testbed/TestbedTest.java
index 164f034..e542e7c 100644
--- a/src/test/java/org/gnunet/testbed/TestbedTest.java
+++ b/src/test/java/org/gnunet/testbed/TestbedTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testbed;
diff --git a/src/test/java/org/gnunet/testing/TestingSetupTest.java b/src/test/java/org/gnunet/testing/TestingSetupTest.java
index 942629d..e77ef20 100644
--- a/src/test/java/org/gnunet/testing/TestingSetupTest.java
+++ b/src/test/java/org/gnunet/testing/TestingSetupTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.testing;
diff --git a/src/test/java/org/gnunet/transport/TransportTest.java b/src/test/java/org/gnunet/transport/TransportTest.java
index f10b9da..036425c 100644
--- a/src/test/java/org/gnunet/transport/TransportTest.java
+++ b/src/test/java/org/gnunet/transport/TransportTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.transport;
diff --git a/src/test/java/org/gnunet/util/Assertion.java b/src/test/java/org/gnunet/util/Assertion.java
index f7e0b14..237fac5 100644
--- a/src/test/java/org/gnunet/util/Assertion.java
+++ b/src/test/java/org/gnunet/util/Assertion.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/ConfigDollarTest.java b/src/test/java/org/gnunet/util/ConfigDollarTest.java
index 6972a93..4e1d024 100644
--- a/src/test/java/org/gnunet/util/ConfigDollarTest.java
+++ b/src/test/java/org/gnunet/util/ConfigDollarTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/EcdheTest.java b/src/test/java/org/gnunet/util/EcdheTest.java
index c4e41ba..7429d76 100644
--- a/src/test/java/org/gnunet/util/EcdheTest.java
+++ b/src/test/java/org/gnunet/util/EcdheTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/EcdsaTest.java b/src/test/java/org/gnunet/util/EcdsaTest.java
index 34ed4b5..726a868 100644
--- a/src/test/java/org/gnunet/util/EcdsaTest.java
+++ b/src/test/java/org/gnunet/util/EcdsaTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/Ed25519Test.java b/src/test/java/org/gnunet/util/Ed25519Test.java
index e80b2cc..09a13a6 100644
--- a/src/test/java/org/gnunet/util/Ed25519Test.java
+++ b/src/test/java/org/gnunet/util/Ed25519Test.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/EddsaTest.java b/src/test/java/org/gnunet/util/EddsaTest.java
index 719b98e..728b746 100644
--- a/src/test/java/org/gnunet/util/EddsaTest.java
+++ b/src/test/java/org/gnunet/util/EddsaTest.java
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/ResolverTest.java b/src/test/java/org/gnunet/util/ResolverTest.java
index 9e27e23..04ae7e6 100644
--- a/src/test/java/org/gnunet/util/ResolverTest.java
+++ b/src/test/java/org/gnunet/util/ResolverTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/ServerExample.java b/src/test/java/org/gnunet/util/ServerExample.java
index c19ef4b..26891d2 100644
--- a/src/test/java/org/gnunet/util/ServerExample.java
+++ b/src/test/java/org/gnunet/util/ServerExample.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/Wrapper.java b/src/test/java/org/gnunet/util/Wrapper.java
index 0e05e8c..6e1a95b 100644
--- a/src/test/java/org/gnunet/util/Wrapper.java
+++ b/src/test/java/org/gnunet/util/Wrapper.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util;
diff --git a/src/test/java/org/gnunet/util/getopt/GetoptTest.java b/src/test/java/org/gnunet/util/getopt/GetoptTest.java
index 0f1180f..5f2845c 100644
--- a/src/test/java/org/gnunet/util/getopt/GetoptTest.java
+++ b/src/test/java/org/gnunet/util/getopt/GetoptTest.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.util.getopt;
diff --git a/src/test/java/org/gnunet/voting/TestVotingCrypto.java b/src/test/java/org/gnunet/voting/TestVotingCrypto.java
index 99558e0..2cf4fbe 100644
--- a/src/test/java/org/gnunet/voting/TestVotingCrypto.java
+++ b/src/test/java/org/gnunet/voting/TestVotingCrypto.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.gnunet.voting;
diff --git a/src/test/java/org/grothoff/RunaboutBenchmark.java b/src/test/java/org/grothoff/RunaboutBenchmark.java
index b3bfef8..a929563 100644
--- a/src/test/java/org/grothoff/RunaboutBenchmark.java
+++ b/src/test/java/org/grothoff/RunaboutBenchmark.java
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 
 package org.grothoff;