build: Replace fsf snail mail with contact URL

191 files changed, 191 insertions, 270 deletions

diff --git a/include/ouroboros/bitmap.h b/include/ouroboros/bitmap.h
index d6bb250..a5921fc 100644
--- a/include/ouroboros/bitmap.h
+++ b/include/ouroboros/bitmap.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_BITMAP_H
diff --git a/include/ouroboros/btree.h b/include/ouroboros/btree.h
index f7c293c..833ba15 100644
--- a/include/ouroboros/btree.h
+++ b/include/ouroboros/btree.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_LIB_BTREE_H
diff --git a/include/ouroboros/cacep.h b/include/ouroboros/cacep.h
index fb52fd0..d2b0de9 100644
--- a/include/ouroboros/cacep.h
+++ b/include/ouroboros/cacep.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_CACEP_H
diff --git a/include/ouroboros/cdap.h b/include/ouroboros/cdap.h
index fe16a9c..46ebca4 100644
--- a/include/ouroboros/cdap.h
+++ b/include/ouroboros/cdap.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_H
diff --git a/include/ouroboros/cdefs.h b/include/ouroboros/cdefs.h
index da7c473..094a389 100644
--- a/include/ouroboros/cdefs.h
+++ b/include/ouroboros/cdefs.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_CDEFS_H
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index d1dac3e..b970217 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -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_CONFIG
diff --git a/include/ouroboros/crc32.h b/include/ouroboros/crc32.h
index 800d6c4..7ee63af 100644
--- a/include/ouroboros/crc32.h
+++ b/include/ouroboros/crc32.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_CRC32_H
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h
index 73d2d7b..0441179 100644
--- a/include/ouroboros/dev.h
+++ b/include/ouroboros/dev.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_DEV_H
diff --git a/include/ouroboros/endian.h b/include/ouroboros/endian.h
index f93428b..18df0e9 100644
--- a/include/ouroboros/endian.h
+++ b/include/ouroboros/endian.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_ENDIAN_H
diff --git a/include/ouroboros/errno.h b/include/ouroboros/errno.h
index fa1a33f..7cd58aa 100644
--- a/include/ouroboros/errno.h
+++ b/include/ouroboros/errno.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_ERRNO_H
diff --git a/include/ouroboros/fcntl.h b/include/ouroboros/fcntl.h
index 489fff1..655a0a0 100644
--- a/include/ouroboros/fcntl.h
+++ b/include/ouroboros/fcntl.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_FCNTL_H
diff --git a/include/ouroboros/fqueue.h b/include/ouroboros/fqueue.h
index 604fabf..716d021 100644
--- a/include/ouroboros/fqueue.h
+++ b/include/ouroboros/fqueue.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_FQUEUE_H
diff --git a/include/ouroboros/hash.h b/include/ouroboros/hash.h
index 6d3f98a..db47c9f 100644
--- a/include/ouroboros/hash.h
+++ b/include/ouroboros/hash.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_LIB_HASH_H
diff --git a/include/ouroboros/hashtable.h b/include/ouroboros/hashtable.h
index 5e1ff4b..35fa202 100644
--- a/include/ouroboros/hashtable.h
+++ b/include/ouroboros/hashtable.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_HASHTABLE_H
diff --git a/include/ouroboros/ipcp-dev.h b/include/ouroboros/ipcp-dev.h
index cdf9f5c..70c604e 100644
--- a/include/ouroboros/ipcp-dev.h
+++ b/include/ouroboros/ipcp-dev.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/.
  */
 
 #include <ouroboros/shm_rdrbuff.h>
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 2be47f2..11095ba 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.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_IPCP_H
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 61b2fd8..5ad8f75 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.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_IRM_H
diff --git a/include/ouroboros/list.h b/include/ouroboros/list.h
index 4062765..169c837 100644
--- a/include/ouroboros/list.h
+++ b/include/ouroboros/list.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_LIB_LIST_H
diff --git a/include/ouroboros/local-dev.h b/include/ouroboros/local-dev.h
index 228a2a9..db549c2 100644
--- a/include/ouroboros/local-dev.h
+++ b/include/ouroboros/local-dev.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_LOCAL_DEV_H
diff --git a/include/ouroboros/lockfile.h b/include/ouroboros/lockfile.h
index 1b98809..4fa3954 100644
--- a/include/ouroboros/lockfile.h
+++ b/include/ouroboros/lockfile.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_LOCKFILE_H
diff --git a/include/ouroboros/logs.h b/include/ouroboros/logs.h
index 2d8a6e8..c3b1221 100644
--- a/include/ouroboros/logs.h
+++ b/include/ouroboros/logs.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_LOGS_H
diff --git a/include/ouroboros/md5.h b/include/ouroboros/md5.h
index a628e6c..d8b00c3 100644
--- a/include/ouroboros/md5.h
+++ b/include/ouroboros/md5.h
@@ -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/include/ouroboros/np1_flow.h b/include/ouroboros/np1_flow.h
index 3db2a0d..3231a39 100644
--- a/include/ouroboros/np1_flow.h
+++ b/include/ouroboros/np1_flow.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_NP1_FLOW_H
diff --git a/include/ouroboros/nsm.h b/include/ouroboros/nsm.h
index 45adfed..d89a2ee 100644
--- a/include/ouroboros/nsm.h
+++ b/include/ouroboros/nsm.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_NSM_H
diff --git a/include/ouroboros/proto.h b/include/ouroboros/proto.h
index 30c549c..d9fd39e 100644
--- a/include/ouroboros/proto.h
+++ b/include/ouroboros/proto.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_PROTO_H
diff --git a/include/ouroboros/qos.h b/include/ouroboros/qos.h
index 78bdba4..f68df91 100644
--- a/include/ouroboros/qos.h
+++ b/include/ouroboros/qos.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_QOS_H
diff --git a/include/ouroboros/qoscube.h b/include/ouroboros/qoscube.h
index 5d339ad..3fd3d80 100644
--- a/include/ouroboros/qoscube.h
+++ b/include/ouroboros/qoscube.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_QOSCUBE_H
diff --git a/include/ouroboros/random.h b/include/ouroboros/random.h
index 08555e8..4126b6b 100644
--- a/include/ouroboros/random.h
+++ b/include/ouroboros/random.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_RANDOM_H
diff --git a/include/ouroboros/rib.h b/include/ouroboros/rib.h
index 320ef86..281a4f2 100644
--- a/include/ouroboros/rib.h
+++ b/include/ouroboros/rib.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_LIB_RIB_H
diff --git a/include/ouroboros/rqueue.h b/include/ouroboros/rqueue.h
index b0ec4a6..601a4ab 100644
--- a/include/ouroboros/rqueue.h
+++ b/include/ouroboros/rqueue.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_RQUEUE_H
diff --git a/include/ouroboros/sha3.h b/include/ouroboros/sha3.h
index 2357b4a..48e6d6f 100644
--- a/include/ouroboros/sha3.h
+++ b/include/ouroboros/sha3.h
@@ -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/include/ouroboros/shm_du_buff.h b/include/ouroboros/shm_du_buff.h
index 9f796be..c558f37 100644
--- a/include/ouroboros/shm_du_buff.h
+++ b/include/ouroboros/shm_du_buff.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_SHM_DU_BUFF_H
diff --git a/include/ouroboros/shm_flow_set.h b/include/ouroboros/shm_flow_set.h
index 947fe89..5c49833 100644
--- a/include/ouroboros/shm_flow_set.h
+++ b/include/ouroboros/shm_flow_set.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_SHM_FLOW_SET_H
diff --git a/include/ouroboros/shm_rbuff.h b/include/ouroboros/shm_rbuff.h
index 8471f47..1557e50 100644
--- a/include/ouroboros/shm_rbuff.h
+++ b/include/ouroboros/shm_rbuff.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_SHM_RBUFF_H
diff --git a/include/ouroboros/shm_rdrbuff.h b/include/ouroboros/shm_rdrbuff.h
index 1af8d0c..079c11b 100644
--- a/include/ouroboros/shm_rdrbuff.h
+++ b/include/ouroboros/shm_rdrbuff.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_SHM_RDRBUFF_H
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 660709b..c0f5d8c 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.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_SOCKETS_H
diff --git a/include/ouroboros/time_utils.h b/include/ouroboros/time_utils.h
index fc70b1e..0f4a970 100644
--- a/include/ouroboros/time_utils.h
+++ b/include/ouroboros/time_utils.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_TIME_UTILS_H
diff --git a/include/ouroboros/tpm.h b/include/ouroboros/tpm.h
index d34f06f..dc57f48 100644
--- a/include/ouroboros/tpm.h
+++ b/include/ouroboros/tpm.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_LIB_TPM_H
diff --git a/include/ouroboros/utils.h b/include/ouroboros/utils.h
index 19a2909..3348c8b 100644
--- a/include/ouroboros/utils.h
+++ b/include/ouroboros/utils.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_UTILS_H
diff --git a/include/ouroboros/wrap/ouroboros.i b/include/ouroboros/wrap/ouroboros.i
index 746aa1d..4bf343b 100644
--- a/include/ouroboros/wrap/ouroboros.i
+++ b/include/ouroboros/wrap/ouroboros.i
@@ -16,8 +16,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/.
  */
 
 %module ouroboros
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index b54bf0b..a8ff4c9 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 fb69df5..9ce3ed7 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 78224fb..241a47e 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 5b3c617..56b4138 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 6883b4b..5a6dec0 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 aafef62..6285ba6 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 6259969..1513c12 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 12992ef..40d7434 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 c15dacb..f41541d 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 5d7fc89..d893f91 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 69b7e90..231ba11 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 4091a3e..5f3f738 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 5fcc586..290c409 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 15ef51f..99918ea 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 b93d497..6baa7c0 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 2a25254..e139cf9 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 2291329..5f14527 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 f1f804c..be1596d 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 bed4bf9..9b50f6b 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 5e4dcd5..06f10b5 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 929c062..2dde5b4 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 7850576..717a1a8 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 643d83b..9997506 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 752d8e3..3dd01a7 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 0b7e8be..2e2aec9 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 f94c15d..325c128 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 0fb721c..0ac5e95 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 b9fa140..7047d02 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 38ca723..acf4db1 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 7d8ce46..0a33d88 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 f0f473e..a3b3929 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 cfe9cbc..e63752c 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 3a60ca6..0fec10f 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 74848a1..e31f345 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 230fecb..54c4a9e 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 0907cf7..966d0d0 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 d45a89c..af49d28 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 32b281d..761d1f2 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 78ed203..7ec9c03 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 44496bc..8d09252 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 3e0a63d..322b22d 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 e78d054..9b96bca 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 3d433e3..3020180 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 db1ff1b..3a9b6ec 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 3beb917..ee81581 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 83d5ec3..7411aed 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 e1459c1..5bf985f 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 7e47a42..0ef1102 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 a4b9e07..b46f256 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 3c95b68..0537145 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 861ae10..7c9969f 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 2ef48cb..0b81a36 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 1951fa9..4fd1ad3 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 dcbbc04..6d8d089 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 0928169..f54bcad 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 fa77f84..195e3bc 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 c8d2ff1..c32210e 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 ae89a11..ccd8705 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 015bb49..88669a9 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 cf5b033..6ba1b89 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 d309bbf..6086181 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 aa71c73..37a6d06 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 580191d..5765916 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 1bb73df..d2ac772 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 c77e712..da4f4da 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 311c0f3..0daff92 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 528e90a..ade0962 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 15ebb0a..67d0476 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 766c45c..ae5585a 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 223740b..3a302b0 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 d93f175..bf6daac 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 e657156..ad6a10d 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 2b88716..d1733f6 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 97193b5..5a3da73 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 36ec3d8..df35ebc 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 ce1a3ee..6ddaaca 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 03047a1..8be8b99 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 1958512..55d11b0 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 8a159a3..53260a0 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 c120913..bf8d581 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 120b2c9..c83addc 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 a89d6b2..7aded62 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 b21467f..89f4145 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 549938b..d65215f 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 daa41a2..9354855 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 088d43c..d8cabfd 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 2b49ecb..75cdee8 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 25516c2..f0d5f6e 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 8a9ae21..2e6c049 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 828bdfe..a6075d3 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 138810d..117752c 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 d5aba05..1924e0c 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 e84c669..e2e4d28 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 e38f2a8..a5a3752 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 4534b6a..a4d92de 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 979f711..2dd5729 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 035b904..35e16f9 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 4ab827a..bf19338 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 4ce378c..5d6763c 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 e59e0d9..e8cf97d 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 379ccd2..23bdb20 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 2c8a461..ba74418 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 7660b1d..cd6946d 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 dc3f83b..7f8af9f 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 757f65c..33e236b 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 1b9f07d..4400145 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 59f3205..0919b1e 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 63f928c..7f0c4dd 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 4f58de3..0d91a70 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 83fafab..1ce28d6 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 6a8ee9c..4981816 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 1160e34..9d5917f 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 684ecb3..7fda439 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 54926e1..e1fa427 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 0d0e8d0..8a194c6 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 2878132..b7d3716 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 c644c88..2dec452 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 31bb8a7..739996c 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 e97dddb..b22525c 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 b85b39a..537aaa8 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 597ae8a..1461319 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 5ec1d56..decf6f9 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 1a963a6..a2e930e 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 b68e8c0..d07d99a 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 5ec2051..4df5904 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 22175a6..1e57ed6 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 0e77e22..4e275e4 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 bbe370d..03dd76f 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 d23f703..91cdff2 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 6e17109..a0d7587 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 8134708..706fb13 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 fef803d..2850ac8 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 48a31f0..264fbfd 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 494f01f..c98016a 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 1c81c9c..58a6538 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 05b3f6b..1f2a661 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 8f0e790..749ea13 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 094268c..421aee6 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 e21f799..a7802c6 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 a1b07d3..9b53f01 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 6200c21..7002182 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 34af66e..128488f 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 18314e9..c664e4a 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 24841b9..1a2adde 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 d6d2232..ff8aee4 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 5e7f2f3..d2dfeaa 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 7827b62..a905b05 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 b17a4f7..3b43ece 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 a88e06e..be87343 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 4cc1462..d0fc2d6 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 44a301b..3a7f061 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__