Merged in dstaesse/ouroboros/be-license (pull request #552)

build: Replace fsf snail mail with contact URL

151 files changed, 151 insertions, 190 deletions

diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index b54bf0b7..a8ff4c94 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "ipcpd/ipcp"
diff --git a/src/ipcpd/ipcp.h b/src/ipcpd/ipcp.h
index fb69df5c..9ce3ed77 100644
--- a/src/ipcpd/ipcp.h
+++ b/src/ipcpd/ipcp.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef IPCPD_IPCP_H
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 78224fbd..241a47eb 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "ipcpd-local"
diff --git a/src/ipcpd/normal/addr_auth.c b/src/ipcpd/normal/addr_auth.c
index 5b3c6170..56b41384 100644
--- a/src/ipcpd/normal/addr_auth.c
+++ b/src/ipcpd/normal/addr_auth.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "addr_auth"
diff --git a/src/ipcpd/normal/addr_auth.h b/src/ipcpd/normal/addr_auth.h
index 6883b4b3..5a6dec05 100644
--- a/src/ipcpd/normal/addr_auth.h
+++ b/src/ipcpd/normal/addr_auth.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_ADDR_AUTH_H
diff --git a/src/ipcpd/normal/ae.h b/src/ipcpd/normal/ae.h
index aafef625..6285ba6a 100644
--- a/src/ipcpd/normal/ae.h
+++ b/src/ipcpd/normal/ae.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_AE_H
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index 6259969a..1513c12a 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "normal-ipcp"
diff --git a/src/ipcpd/normal/connmgr.h b/src/ipcpd/normal/connmgr.h
index 12992ef6..40d74348 100644
--- a/src/ipcpd/normal/connmgr.h
+++ b/src/ipcpd/normal/connmgr.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_CONNMGR_H
diff --git a/src/ipcpd/normal/dht.c b/src/ipcpd/normal/dht.c
index c15dacbc..f41541d2 100644
--- a/src/ipcpd/normal/dht.c
+++ b/src/ipcpd/normal/dht.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "dht"
diff --git a/src/ipcpd/normal/dht.h b/src/ipcpd/normal/dht.h
index 5d7fc894..d893f913 100644
--- a/src/ipcpd/normal/dht.h
+++ b/src/ipcpd/normal/dht.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_DHT_H
diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c
index 69b7e90e..231ba110 100644
--- a/src/ipcpd/normal/dir.c
+++ b/src/ipcpd/normal/dir.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "directory"
diff --git a/src/ipcpd/normal/dir.h b/src/ipcpd/normal/dir.h
index 4091a3e8..5f3f738e 100644
--- a/src/ipcpd/normal/dir.h
+++ b/src/ipcpd/normal/dir.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_DIR_H
diff --git a/src/ipcpd/normal/dt.c b/src/ipcpd/normal/dt.c
index 5fcc5865..290c409d 100644
--- a/src/ipcpd/normal/dt.c
+++ b/src/ipcpd/normal/dt.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "dt-ae"
diff --git a/src/ipcpd/normal/dt.h b/src/ipcpd/normal/dt.h
index 15ef51f0..99918ea5 100644
--- a/src/ipcpd/normal/dt.h
+++ b/src/ipcpd/normal/dt.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_DT_H
diff --git a/src/ipcpd/normal/dt_const.h b/src/ipcpd/normal/dt_const.h
index b93d497c..6baa7c0b 100644
--- a/src/ipcpd/normal/dt_const.h
+++ b/src/ipcpd/normal/dt_const.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_DT_CONST_H
diff --git a/src/ipcpd/normal/dt_pci.c b/src/ipcpd/normal/dt_pci.c
index 2a252545..e139cf91 100644
--- a/src/ipcpd/normal/dt_pci.c
+++ b/src/ipcpd/normal/dt_pci.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/ipcpd/normal/dt_pci.h b/src/ipcpd/normal/dt_pci.h
index 2291329a..5f14527c 100644
--- a/src/ipcpd/normal/dt_pci.h
+++ b/src/ipcpd/normal/dt_pci.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_DT_PCI_H
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index f1f804c6..be1596d0 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 #define OUROBOROS_PREFIX "enrollment"
 
diff --git a/src/ipcpd/normal/enroll.h b/src/ipcpd/normal/enroll.h
index bed4bf9f..9b50f6bb 100644
--- a/src/ipcpd/normal/enroll.h
+++ b/src/ipcpd/normal/enroll.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_ENROLL_H
diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c
index 5e4dcd5c..06f10b53 100644
--- a/src/ipcpd/normal/fa.c
+++ b/src/ipcpd/normal/fa.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "flow-allocator"
diff --git a/src/ipcpd/normal/fa.h b/src/ipcpd/normal/fa.h
index 929c0623..2dde5b43 100644
--- a/src/ipcpd/normal/fa.h
+++ b/src/ipcpd/normal/fa.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_FA_H
diff --git a/src/ipcpd/normal/flow_alloc.proto b/src/ipcpd/normal/flow_alloc.proto
index 78505761..717a1a81 100644
--- a/src/ipcpd/normal/flow_alloc.proto
+++ b/src/ipcpd/normal/flow_alloc.proto
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/ipcpd/normal/gam.c b/src/ipcpd/normal/gam.c
index 643d83b0..9997506c 100644
--- a/src/ipcpd/normal/gam.c
+++ b/src/ipcpd/normal/gam.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "dt-gam"
diff --git a/src/ipcpd/normal/gam.h b/src/ipcpd/normal/gam.h
index 752d8e37..3dd01a75 100644
--- a/src/ipcpd/normal/gam.h
+++ b/src/ipcpd/normal/gam.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_GAM_H
diff --git a/src/ipcpd/normal/kademlia.proto b/src/ipcpd/normal/kademlia.proto
index 0b7e8beb..2e2aec93 100644
--- a/src/ipcpd/normal/kademlia.proto
+++ b/src/ipcpd/normal/kademlia.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index f94c15de..325c1285 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "normal-ipcp"
diff --git a/src/ipcpd/normal/neighbors.c b/src/ipcpd/normal/neighbors.c
index 0fb721c2..0ac5e958 100644
--- a/src/ipcpd/normal/neighbors.c
+++ b/src/ipcpd/normal/neighbors.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "neighbors"
diff --git a/src/ipcpd/normal/neighbors.h b/src/ipcpd/normal/neighbors.h
index b9fa1405..7047d027 100644
--- a/src/ipcpd/normal/neighbors.h
+++ b/src/ipcpd/normal/neighbors.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_NEIGHBORS_H
diff --git a/src/ipcpd/normal/pff.c b/src/ipcpd/normal/pff.c
index 38ca7232..acf4db1a 100644
--- a/src/ipcpd/normal/pff.c
+++ b/src/ipcpd/normal/pff.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "pff"
diff --git a/src/ipcpd/normal/pff.h b/src/ipcpd/normal/pff.h
index 7d8ce469..0a33d884 100644
--- a/src/ipcpd/normal/pff.h
+++ b/src/ipcpd/normal/pff.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_PFF_H
diff --git a/src/ipcpd/normal/pol-addr-auth-ops.h b/src/ipcpd/normal/pol-addr-auth-ops.h
index f0f473ef..a3b39298 100644
--- a/src/ipcpd/normal/pol-addr-auth-ops.h
+++ b/src/ipcpd/normal/pol-addr-auth-ops.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_POL_ADDR_AUTH_OPS_H
diff --git a/src/ipcpd/normal/pol-gam-ops.h b/src/ipcpd/normal/pol-gam-ops.h
index cfe9cbc3..e63752c0 100644
--- a/src/ipcpd/normal/pol-gam-ops.h
+++ b/src/ipcpd/normal/pol-gam-ops.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_POL_GAM_OPS_H
diff --git a/src/ipcpd/normal/pol-routing-ops.h b/src/ipcpd/normal/pol-routing-ops.h
index 3a60ca6b..0fec10fc 100644
--- a/src/ipcpd/normal/pol-routing-ops.h
+++ b/src/ipcpd/normal/pol-routing-ops.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_POL_ROUTING_OPS_H
diff --git a/src/ipcpd/normal/pol/complete.c b/src/ipcpd/normal/pol/complete.c
index 74848a1f..e31f345a 100644
--- a/src/ipcpd/normal/pol/complete.c
+++ b/src/ipcpd/normal/pol/complete.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "complete"
diff --git a/src/ipcpd/normal/pol/complete.h b/src/ipcpd/normal/pol/complete.h
index 230fecb9..54c4a9ef 100644
--- a/src/ipcpd/normal/pol/complete.h
+++ b/src/ipcpd/normal/pol/complete.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_POL_COMPLETE_H
diff --git a/src/ipcpd/normal/pol/flat.c b/src/ipcpd/normal/pol/flat.c
index 0907cf7a..966d0d03 100644
--- a/src/ipcpd/normal/pol/flat.c
+++ b/src/ipcpd/normal/pol/flat.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "flat-addr-auth"
diff --git a/src/ipcpd/normal/pol/flat.h b/src/ipcpd/normal/pol/flat.h
index d45a89cd..af49d283 100644
--- a/src/ipcpd/normal/pol/flat.h
+++ b/src/ipcpd/normal/pol/flat.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_FLAT_H
diff --git a/src/ipcpd/normal/pol/fso.proto b/src/ipcpd/normal/pol/fso.proto
index 32b281d6..761d1f23 100644
--- a/src/ipcpd/normal/pol/fso.proto
+++ b/src/ipcpd/normal/pol/fso.proto
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/ipcpd/normal/pol/graph.c b/src/ipcpd/normal/pol/graph.c
index 78ed203d..7ec9c035 100644
--- a/src/ipcpd/normal/pol/graph.c
+++ b/src/ipcpd/normal/pol/graph.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "graph"
diff --git a/src/ipcpd/normal/pol/graph.h b/src/ipcpd/normal/pol/graph.h
index 44496bc3..8d092524 100644
--- a/src/ipcpd/normal/pol/graph.h
+++ b/src/ipcpd/normal/pol/graph.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_GRAPH_H
diff --git a/src/ipcpd/normal/pol/link_state.c b/src/ipcpd/normal/pol/link_state.c
index 3e0a63d6..322b22d7 100644
--- a/src/ipcpd/normal/pol/link_state.c
+++ b/src/ipcpd/normal/pol/link_state.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "link-state-routing"
diff --git a/src/ipcpd/normal/pol/link_state.h b/src/ipcpd/normal/pol/link_state.h
index e78d0543..9b96bcab 100644
--- a/src/ipcpd/normal/pol/link_state.h
+++ b/src/ipcpd/normal/pol/link_state.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_POL_LINK_STATE_H
diff --git a/src/ipcpd/normal/pol/tests/graph_test.c b/src/ipcpd/normal/pol/tests/graph_test.c
index 3d433e34..30201800 100644
--- a/src/ipcpd/normal/pol/tests/graph_test.c
+++ b/src/ipcpd/normal/pol/tests/graph_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/ipcpd/normal/ribconfig.h b/src/ipcpd/normal/ribconfig.h
index db1ff1bb..3a9b6ecb 100644
--- a/src/ipcpd/normal/ribconfig.h
+++ b/src/ipcpd/normal/ribconfig.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_RIB_CONFIG_H
diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c
index 3beb917c..ee81581f 100644
--- a/src/ipcpd/normal/ribmgr.c
+++ b/src/ipcpd/normal/ribmgr.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "rib-manager"
diff --git a/src/ipcpd/normal/ribmgr.h b/src/ipcpd/normal/ribmgr.h
index 83d5ec3a..7411aedd 100644
--- a/src/ipcpd/normal/ribmgr.h
+++ b/src/ipcpd/normal/ribmgr.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_RIBMGR_H
diff --git a/src/ipcpd/normal/routing.c b/src/ipcpd/normal/routing.c
index e1459c15..5bf985fb 100644
--- a/src/ipcpd/normal/routing.c
+++ b/src/ipcpd/normal/routing.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "routing"
diff --git a/src/ipcpd/normal/routing.h b/src/ipcpd/normal/routing.h
index 7e47a425..0ef11020 100644
--- a/src/ipcpd/normal/routing.h
+++ b/src/ipcpd/normal/routing.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_ROUTING_H
diff --git a/src/ipcpd/normal/sdu_sched.c b/src/ipcpd/normal/sdu_sched.c
index a4b9e074..b46f2563 100644
--- a/src/ipcpd/normal/sdu_sched.c
+++ b/src/ipcpd/normal/sdu_sched.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "sdu-scheduler"
diff --git a/src/ipcpd/normal/sdu_sched.h b/src/ipcpd/normal/sdu_sched.h
index 3c95b683..05371452 100644
--- a/src/ipcpd/normal/sdu_sched.h
+++ b/src/ipcpd/normal/sdu_sched.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_NORMAL_SDU_SCHED_H
diff --git a/src/ipcpd/normal/tests/dht_test.c b/src/ipcpd/normal/tests/dht_test.c
index 861ae10a..7c9969f5 100644
--- a/src/ipcpd/normal/tests/dht_test.c
+++ b/src/ipcpd/normal/tests/dht_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define __DHT_TEST__
diff --git a/src/ipcpd/shim-data.c b/src/ipcpd/shim-data.c
index 2ef48cb0..0b81a36a 100644
--- a/src/ipcpd/shim-data.c
+++ b/src/ipcpd/shim-data.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/ipcpd/shim-data.h b/src/ipcpd/shim-data.h
index 1951fa9d..4fd1ad3d 100644
--- a/src/ipcpd/shim-data.h
+++ b/src/ipcpd/shim-data.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef IPCPD_IPCP_DATA_H
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index dcbbc047..6d8d0895 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _DEFAULT_SOURCE
diff --git a/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto b/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto
index 09281698..f54bcada 100644
--- a/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto
+++ b/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index fa77f843..195e3bc0 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "ipcpd/shim-udp"
diff --git a/src/ipcpd/shim-udp/shim_udp_config.h.in b/src/ipcpd/shim-udp/shim_udp_config.h.in
index c8d2ff18..c32210e9 100644
--- a/src/ipcpd/shim-udp/shim_udp_config.h.in
+++ b/src/ipcpd/shim-udp/shim_udp_config.h.in
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_SHIM_UDP_CONFIG
diff --git a/src/ipcpd/shim-udp/shim_udp_messages.proto b/src/ipcpd/shim-udp/shim_udp_messages.proto
index ae89a119..ccd87053 100644
--- a/src/ipcpd/shim-udp/shim_udp_messages.proto
+++ b/src/ipcpd/shim-udp/shim_udp_messages.proto
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/ipcpd/shim-udp/tests/shim_udp_test.c b/src/ipcpd/shim-udp/tests/shim_udp_test.c
index 015bb49f..88669a9e 100644
--- a/src/ipcpd/shim-udp/tests/shim_udp_test.c
+++ b/src/ipcpd/shim-udp/tests/shim_udp_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/ipcpd/tests/timerwheel_test.c b/src/ipcpd/tests/timerwheel_test.c
index cf5b0333..6ba1b890 100644
--- a/src/ipcpd/tests/timerwheel_test.c
+++ b/src/ipcpd/tests/timerwheel_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include "timerwheel.c"
diff --git a/src/ipcpd/timerwheel.c b/src/ipcpd/timerwheel.c
index d309bbf9..6086181a 100644
--- a/src/ipcpd/timerwheel.c
+++ b/src/ipcpd/timerwheel.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/ipcpd/timerwheel.h b/src/ipcpd/timerwheel.h
index aa71c73d..37a6d06a 100644
--- a/src/ipcpd/timerwheel.h
+++ b/src/ipcpd/timerwheel.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IPCPD_TIMERWHEEL_H
diff --git a/src/irmd/api_table.c b/src/irmd/api_table.c
index 580191da..5765916e 100644
--- a/src/irmd/api_table.c
+++ b/src/irmd/api_table.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/irmd/api_table.h b/src/irmd/api_table.h
index 1bb73df7..d2ac7723 100644
--- a/src/irmd/api_table.h
+++ b/src/irmd/api_table.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IRMD_API_TABLE_H
diff --git a/src/irmd/apn_table.c b/src/irmd/apn_table.c
index c77e7128..da4f4da1 100644
--- a/src/irmd/apn_table.c
+++ b/src/irmd/apn_table.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/errno.h>
diff --git a/src/irmd/apn_table.h b/src/irmd/apn_table.h
index 311c0f3d..0daff929 100644
--- a/src/irmd/apn_table.h
+++ b/src/irmd/apn_table.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IRMD_APN_TABLE_H
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index 528e90a2..ade09625 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "irmd/ipcp"
diff --git a/src/irmd/ipcp.h b/src/irmd/ipcp.h
index 15ebb0ae..67d0476f 100644
--- a/src/irmd/ipcp.h
+++ b/src/irmd/ipcp.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/ipcp.h>
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c
index 766c45ca..ae5585a2 100644
--- a/src/irmd/irm_flow.c
+++ b/src/irmd/irm_flow.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "irm_flow"
diff --git a/src/irmd/irm_flow.h b/src/irmd/irm_flow.h
index 223740b7..3a302b02 100644
--- a/src/irmd/irm_flow.h
+++ b/src/irmd/irm_flow.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IRMD_IRM_FLOW_H
diff --git a/src/irmd/main.c b/src/irmd/main.c
index d93f1755..bf6daacc 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "irmd"
diff --git a/src/irmd/registry.c b/src/irmd/registry.c
index e6571564..ad6a10d4 100644
--- a/src/irmd/registry.c
+++ b/src/irmd/registry.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "registry"
diff --git a/src/irmd/registry.h b/src/irmd/registry.h
index 2b887162..d1733f6c 100644
--- a/src/irmd/registry.h
+++ b/src/irmd/registry.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_IRMD_REGISTRY_H
diff --git a/src/irmd/utils.c b/src/irmd/utils.c
index 97193b53..5a3da732 100644
--- a/src/irmd/utils.c
+++ b/src/irmd/utils.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/irmd/utils.h b/src/irmd/utils.h
index 36ec3d8e..df35ebc9 100644
--- a/src/irmd/utils.h
+++ b/src/irmd/utils.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 /*
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index ce1a3ee9..6ddaaca4 100644
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/bitmap.h>
diff --git a/src/lib/btree.c b/src/lib/btree.c
index 03047a18..8be8b99f 100644
--- a/src/lib/btree.c
+++ b/src/lib/btree.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/errno.h>
diff --git a/src/lib/cacep.c b/src/lib/cacep.c
index 19585126..55d11b0f 100644
--- a/src/lib/cacep.c
+++ b/src/lib/cacep.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/cacep.proto b/src/lib/cacep.proto
index 8a159a35..53260a0c 100644
--- a/src/lib/cacep.proto
+++ b/src/lib/cacep.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/cdap.c b/src/lib/cdap.c
index c1209138..bf8d5816 100644
--- a/src/lib/cdap.c
+++ b/src/lib/cdap.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/cdap.proto b/src/lib/cdap.proto
index 120b2c97..c83addcb 100644
--- a/src/lib/cdap.proto
+++ b/src/lib/cdap.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/cdap_req.c b/src/lib/cdap_req.c
index a89d6b2a..7aded62f 100644
--- a/src/lib/cdap_req.c
+++ b/src/lib/cdap_req.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/cdap_req.h b/src/lib/cdap_req.h
index b21467f3..89f4145a 100644
--- a/src/lib/cdap_req.h
+++ b/src/lib/cdap_req.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifndef OUROBOROS_CDAP_REQ_H
diff --git a/src/lib/crc32.c b/src/lib/crc32.c
index 549938b8..d65215f9 100644
--- a/src/lib/crc32.c
+++ b/src/lib/crc32.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/crc32.h>
diff --git a/src/lib/dev.c b/src/lib/dev.c
index daa41a23..9354855b 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/hash.c b/src/lib/hash.c
index 088d43cd..d8cabfd3 100644
--- a/src/lib/hash.c
+++ b/src/lib/hash.c
@@ -20,8 +20,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/hashtable.c b/src/lib/hashtable.c
index 2b49ecba..75cdee84 100644
--- a/src/lib/hashtable.c
+++ b/src/lib/hashtable.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/hashtable.h>
diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto
index 25516c2c..f0d5f6eb 100644
--- a/src/lib/ipcp_config.proto
+++ b/src/lib/ipcp_config.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto
index 8a9ae214..2e6c0497 100644
--- a/src/lib/ipcpd_messages.proto
+++ b/src/lib/ipcpd_messages.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/irm.c b/src/lib/irm.c
index 828bdfe6..a6075d33 100644
--- a/src/lib/irm.c
+++ b/src/lib/irm.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/irmd_messages.proto b/src/lib/irmd_messages.proto
index 138810da..117752c8 100644
--- a/src/lib/irmd_messages.proto
+++ b/src/lib/irmd_messages.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/list.c b/src/lib/list.c
index d5aba058..1924e0c1 100644
--- a/src/lib/list.c
+++ b/src/lib/list.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/list.h>
diff --git a/src/lib/lockfile.c b/src/lib/lockfile.c
index e84c6692..e2e4d289 100644
--- a/src/lib/lockfile.c
+++ b/src/lib/lockfile.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/logs.c b/src/lib/logs.c
index e38f2a8b..a5a37527 100644
--- a/src/lib/logs.c
+++ b/src/lib/logs.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "logging"
diff --git a/src/lib/md5.c b/src/lib/md5.c
index 4534b6a1..a4d92de3 100644
--- a/src/lib/md5.c
+++ b/src/lib/md5.c
@@ -20,8 +20,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  *
  *    -- original license
  *
diff --git a/src/lib/nsm.c b/src/lib/nsm.c
index 979f711e..2dd5729b 100644
--- a/src/lib/nsm.c
+++ b/src/lib/nsm.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/nsm.h>
diff --git a/src/lib/qos.c b/src/lib/qos.c
index 035b9049..35e16f97 100644
--- a/src/lib/qos.c
+++ b/src/lib/qos.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/qos.h>
diff --git a/src/lib/qoscube.c b/src/lib/qoscube.c
index 4ab827a6..bf193389 100644
--- a/src/lib/qoscube.c
+++ b/src/lib/qoscube.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/qoscube.h>
diff --git a/src/lib/random.c b/src/lib/random.c
index 4ce378cd..5d6763ca 100644
--- a/src/lib/random.c
+++ b/src/lib/random.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/rib.c b/src/lib/rib.c
index e59e0d94..e8cf97d4 100644
--- a/src/lib/rib.c
+++ b/src/lib/rib.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/ro.proto b/src/lib/ro.proto
index 379ccd27..23bdb200 100644
--- a/src/lib/ro.proto
+++ b/src/lib/ro.proto
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 syntax = "proto2";
diff --git a/src/lib/sha3.c b/src/lib/sha3.c
index 2c8a4614..ba74418a 100644
--- a/src/lib/sha3.c
+++ b/src/lib/sha3.c
@@ -20,8 +20,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 /* sha3.c - an implementation of Secure Hash Algorithm 3 (Keccak).
diff --git a/src/lib/shm_flow_set.c b/src/lib/shm_flow_set.c
index 7660b1dd..cd6946d4 100644
--- a/src/lib/shm_flow_set.c
+++ b/src/lib/shm_flow_set.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/shm_rbuff.c b/src/lib/shm_rbuff.c
index dc3f83b3..7f8af9f5 100644
--- a/src/lib/shm_rbuff.c
+++ b/src/lib/shm_rbuff.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 #include <ouroboros/config.h>
 
diff --git a/src/lib/shm_rbuff_ll.c b/src/lib/shm_rbuff_ll.c
index 757f65c8..33e236b0 100644
--- a/src/lib/shm_rbuff_ll.c
+++ b/src/lib/shm_rbuff_ll.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/shm_rbuff_pthr.c b/src/lib/shm_rbuff_pthr.c
index 1b9f07d1..44001458 100644
--- a/src/lib/shm_rbuff_pthr.c
+++ b/src/lib/shm_rbuff_pthr.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c
index 59f32056..0919b1e0 100644
--- a/src/lib/shm_rdrbuff.c
+++ b/src/lib/shm_rdrbuff.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/sockets.c b/src/lib/sockets.c
index 63f928cf..7f0c4dd4 100644
--- a/src/lib/sockets.c
+++ b/src/lib/sockets.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/tests/bitmap_test.c b/src/lib/tests/bitmap_test.c
index 4f58de3b..0d91a700 100644
--- a/src/lib/tests/bitmap_test.c
+++ b/src/lib/tests/bitmap_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include "bitmap.c"
diff --git a/src/lib/tests/btree_test.c b/src/lib/tests/btree_test.c
index 83fafabd..1ce28d6a 100644
--- a/src/lib/tests/btree_test.c
+++ b/src/lib/tests/btree_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 
diff --git a/src/lib/tests/crc32_test.c b/src/lib/tests/crc32_test.c
index 6a8ee9c3..49818161 100644
--- a/src/lib/tests/crc32_test.c
+++ b/src/lib/tests/crc32_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/crc32.h>
diff --git a/src/lib/tests/hashtable_test.c b/src/lib/tests/hashtable_test.c
index 1160e34d..9d5917f4 100644
--- a/src/lib/tests/hashtable_test.c
+++ b/src/lib/tests/hashtable_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include "hashtable.c"
diff --git a/src/lib/tests/md5_test.c b/src/lib/tests/md5_test.c
index 684ecb3f..7fda4394 100644
--- a/src/lib/tests/md5_test.c
+++ b/src/lib/tests/md5_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/md5.h>
diff --git a/src/lib/tests/rib_test.c b/src/lib/tests/rib_test.c
index 54926e10..e1fa427d 100644
--- a/src/lib/tests/rib_test.c
+++ b/src/lib/tests/rib_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/tests/sha3_test.c b/src/lib/tests/sha3_test.c
index 0d0e8d0a..8a194c68 100644
--- a/src/lib/tests/sha3_test.c
+++ b/src/lib/tests/sha3_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/sha3.h>
diff --git a/src/lib/tests/time_utils_test.c b/src/lib/tests/time_utils_test.c
index 2878132b..b7d37160 100644
--- a/src/lib/tests/time_utils_test.c
+++ b/src/lib/tests/time_utils_test.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 200809L
diff --git a/src/lib/time_utils.c b/src/lib/time_utils.c
index c644c889..2dec4524 100644
--- a/src/lib/time_utils.c
+++ b/src/lib/time_utils.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/tpm.c b/src/lib/tpm.c
index 31bb8a7f..739996c4 100644
--- a/src/lib/tpm.c
+++ b/src/lib/tpm.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/config.h>
diff --git a/src/lib/utils.c b/src/lib/utils.c
index e97dddb0..b22525ca 100644
--- a/src/lib/utils.c
+++ b/src/lib/utils.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdlib.h>
diff --git a/src/nsmd/main.c b/src/nsmd/main.c
index b85b39a9..537aaa81 100644
--- a/src/nsmd/main.c
+++ b/src/nsmd/main.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define OUROBOROS_PREFIX "nsmd"
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c
index 597ae8a6..14613198 100644
--- a/src/tools/cbr/cbr.c
+++ b/src/tools/cbr/cbr.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 199506L
diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c
index 5ec1d560..decf6f96 100644
--- a/src/tools/cbr/cbr_client.c
+++ b/src/tools/cbr/cbr_client.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/dev.h>
diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c
index 1a963a64..a2e930e5 100644
--- a/src/tools/cbr/cbr_server.c
+++ b/src/tools/cbr/cbr_server.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/dev.h>
diff --git a/src/tools/echo/echo.c b/src/tools/echo/echo.c
index b68e8c02..d07d99a3 100644
--- a/src/tools/echo/echo.c
+++ b/src/tools/echo/echo.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 199309L
diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
index 5ec2051f..4df5904d 100644
--- a/src/tools/echo/echo_client.c
+++ b/src/tools/echo/echo_client.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/dev.h>
diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c
index 22175a65..1e57ed60 100644
--- a/src/tools/echo/echo_server.c
+++ b/src/tools/echo/echo_server.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdbool.h>
diff --git a/src/tools/irm/irm.c b/src/tools/irm/irm.c
index 0e77e22a..4e275e48 100644
--- a/src/tools/irm/irm.c
+++ b/src/tools/irm/irm.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/irm.h>
diff --git a/src/tools/irm/irm_bind.c b/src/tools/irm/irm_bind.c
index bbe370db..03dd76fb 100644
--- a/src/tools/irm/irm_bind.c
+++ b/src/tools/irm/irm_bind.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_bind_ap.c b/src/tools/irm/irm_bind_ap.c
index d23f7035..91cdff2f 100644
--- a/src/tools/irm/irm_bind_ap.c
+++ b/src/tools/irm/irm_bind_ap.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 200809L
diff --git a/src/tools/irm/irm_bind_api.c b/src/tools/irm/irm_bind_api.c
index 6e171099..a0d7587f 100644
--- a/src/tools/irm/irm_bind_api.c
+++ b/src/tools/irm/irm_bind_api.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_bind_ipcp.c b/src/tools/irm/irm_bind_ipcp.c
index 81347080..706fb13d 100644
--- a/src/tools/irm/irm_bind_ipcp.c
+++ b/src/tools/irm/irm_bind_ipcp.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_ipcp.c b/src/tools/irm/irm_ipcp.c
index fef803d9..2850ac89 100644
--- a/src/tools/irm/irm_ipcp.c
+++ b/src/tools/irm/irm_ipcp.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c
index 48a31f08..264fbfd5 100644
--- a/src/tools/irm/irm_ipcp_bootstrap.c
+++ b/src/tools/irm/irm_ipcp_bootstrap.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_ipcp_create.c b/src/tools/irm/irm_ipcp_create.c
index 494f01f5..c98016aa 100644
--- a/src/tools/irm/irm_ipcp_create.c
+++ b/src/tools/irm/irm_ipcp_create.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/irm.h>
diff --git a/src/tools/irm/irm_ipcp_destroy.c b/src/tools/irm/irm_ipcp_destroy.c
index 1c81c9ce..58a65386 100644
--- a/src/tools/irm/irm_ipcp_destroy.c
+++ b/src/tools/irm/irm_ipcp_destroy.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_ipcp_enroll.c b/src/tools/irm/irm_ipcp_enroll.c
index 05b3f6b6..1f2a661e 100644
--- a/src/tools/irm/irm_ipcp_enroll.c
+++ b/src/tools/irm/irm_ipcp_enroll.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_ops.h b/src/tools/irm/irm_ops.h
index 8f0e790e..749ea13d 100644
--- a/src/tools/irm/irm_ops.h
+++ b/src/tools/irm/irm_ops.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 int ipcp_cmd(int     argc,
diff --git a/src/tools/irm/irm_register.c b/src/tools/irm/irm_register.c
index 094268c0..421aee66 100644
--- a/src/tools/irm/irm_register.c
+++ b/src/tools/irm/irm_register.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/irm.h>
diff --git a/src/tools/irm/irm_unbind.c b/src/tools/irm/irm_unbind.c
index e21f7993..a7802c61 100644
--- a/src/tools/irm/irm_unbind.c
+++ b/src/tools/irm/irm_unbind.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_unbind_ap.c b/src/tools/irm/irm_unbind_ap.c
index a1b07d36..9b53f015 100644
--- a/src/tools/irm/irm_unbind_ap.c
+++ b/src/tools/irm/irm_unbind_ap.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_unbind_api.c b/src/tools/irm/irm_unbind_api.c
index 6200c21f..7002182f 100644
--- a/src/tools/irm/irm_unbind_api.c
+++ b/src/tools/irm/irm_unbind_api.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_unbind_ipcp.c b/src/tools/irm/irm_unbind_ipcp.c
index 34af66e0..128488fb 100644
--- a/src/tools/irm/irm_unbind_ipcp.c
+++ b/src/tools/irm/irm_unbind_ipcp.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_unregister.c b/src/tools/irm/irm_unregister.c
index 18314e96..c664e4a1 100644
--- a/src/tools/irm/irm_unregister.c
+++ b/src/tools/irm/irm_unregister.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <stdio.h>
diff --git a/src/tools/irm/irm_utils.c b/src/tools/irm/irm_utils.c
index 24841b99..1a2addee 100644
--- a/src/tools/irm/irm_utils.c
+++ b/src/tools/irm/irm_utils.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <string.h>
diff --git a/src/tools/irm/irm_utils.h b/src/tools/irm/irm_utils.h
index d6d2232c..ff8aee42 100644
--- a/src/tools/irm/irm_utils.h
+++ b/src/tools/irm/irm_utils.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 int matches(const char * cmd,
diff --git a/src/tools/operf/operf.c b/src/tools/operf/operf.c
index 5e7f2f37..d2dfeaa3 100644
--- a/src/tools/operf/operf.c
+++ b/src/tools/operf/operf.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 199506L
diff --git a/src/tools/operf/operf_client.c b/src/tools/operf/operf_client.c
index 7827b62b..a905b05e 100644
--- a/src/tools/operf/operf_client.c
+++ b/src/tools/operf/operf_client.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/dev.h>
diff --git a/src/tools/operf/operf_server.c b/src/tools/operf/operf_server.c
index b17a4f7b..3b43ece4 100644
--- a/src/tools/operf/operf_server.c
+++ b/src/tools/operf/operf_server.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifdef __FreeBSD__
diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c
index a88e06e5..be87343e 100644
--- a/src/tools/oping/oping.c
+++ b/src/tools/oping/oping.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #define _POSIX_C_SOURCE 199506L
diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index 4cc14623..d0fc2d66 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #include <ouroboros/dev.h>
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 44a301ba..3a7f061c 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
 #ifdef __FreeBSD__