diff --git a/examples/memcached-client.scm b/examples/memcached-client.scm
index 6d4ec0e..4aad299 100644
--- a/examples/memcached-client.scm
+++ b/examples/memcached-client.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (rnrs bytevectors)
              (fibers)
diff --git a/examples/memcached-server.scm b/examples/memcached-server.scm
index b8ed25f..0a778f8 100644
--- a/examples/memcached-server.scm
+++ b/examples/memcached-server.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (rnrs bytevectors)
              (fibers)
diff --git a/examples/ping-client.scm b/examples/ping-client.scm
index a4f09bd..f50f947 100644
--- a/examples/ping-client.scm
+++ b/examples/ping-client.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (rnrs bytevectors)
              (fibers)
diff --git a/examples/ping-server.scm b/examples/ping-server.scm
index cdc8519..09954bd 100644
--- a/examples/ping-server.scm
+++ b/examples/ping-server.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (rnrs bytevectors)
              (fibers)
diff --git a/extensions/clock-nanosleep.h b/extensions/clock-nanosleep.h
index 4736b8d..c2c9b9e 100644
--- a/extensions/clock-nanosleep.h
+++ b/extensions/clock-nanosleep.h
@@ -10,10 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef FIBERS_CLOCK_NANOSLEEP_H
diff --git a/extensions/darwin/affinity.c b/extensions/darwin/affinity.c
index 6d19745..cea3b07 100644
--- a/extensions/darwin/affinity.c
+++ b/extensions/darwin/affinity.c
@@ -9,10 +9,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/extensions/darwin/clock-nanosleep.c b/extensions/darwin/clock-nanosleep.c
index 8a8b7b5..34f3622 100644
--- a/extensions/darwin/clock-nanosleep.c
+++ b/extensions/darwin/clock-nanosleep.c
@@ -10,10 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "clock-nanosleep.h"
diff --git a/extensions/epoll.c b/extensions/epoll.c
index 6e5a6f7..9b6f2bb 100644
--- a/extensions/epoll.c
+++ b/extensions/epoll.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/extensions/libevent.c b/extensions/libevent.c
index 83d003c..9436f6a 100644
--- a/extensions/libevent.c
+++ b/extensions/libevent.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/fibers.scm b/fibers.scm
index cd045b3..3cb4d95 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers)
diff --git a/fibers/affinity.scm b/fibers/affinity.scm
index 05c12f3..f3f1b7e 100644
--- a/fibers/affinity.scm
+++ b/fibers/affinity.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Guile defines setaffinity and getaffinity in some systems (e.g. Linux). For
 ;;; those systems where those procedures are not available there should be a
diff --git a/fibers/channels.scm b/fibers/channels.scm
index 9dbabb7..fe25639 100644
--- a/fibers/channels.scm
+++ b/fibers/channels.scm
@@ -13,9 +13,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Channel implementation following the 2009 ICFP paper "Parallel
 ;;; Concurrent ML" by John Reppy, Claudio V. Russo, and Yingqui Xiao.
diff --git a/fibers/conditions.scm b/fibers/conditions.scm
index cae5086..4d0f3e0 100644
--- a/fibers/conditions.scm
+++ b/fibers/conditions.scm
@@ -2,20 +2,19 @@
 
 ;;;; Copyright (C) 2017 Andy Wingo <wingo@pobox.com>
 ;;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Condition variable (cvar) implementation following the 2009 ICFP
 ;;; paper "Parallel Concurrent ML" by John Reppy, Claudio V. Russo,
diff --git a/fibers/config.scm.in b/fibers/config.scm.in
index a330339..304adf4 100644
--- a/fibers/config.scm.in
+++ b/fibers/config.scm.in
@@ -1,21 +1,20 @@
 ;; fibers
 
 ;;;; Copyright (C) 2017 Andy Wingo <wingo@pobox.com>
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
-;;;; 
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;;;
 
 (define-module (fibers config)
   #:export (extension-library))
diff --git a/fibers/counter.scm b/fibers/counter.scm
index 569d74c..d652de8 100644
--- a/fibers/counter.scm
+++ b/fibers/counter.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; General atomic counters; currently used for garbage collection.
 
diff --git a/fibers/deque.scm b/fibers/deque.scm
index d427729..14db938 100644
--- a/fibers/deque.scm
+++ b/fibers/deque.scm
@@ -2,20 +2,19 @@
 
 ;;;; Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
 ;;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (fibers deque)
   #:use-module (srfi srfi-9)
diff --git a/fibers/epoll.scm b/fibers/epoll.scm
index 75c09cd..71e6439 100644
--- a/fibers/epoll.scm
+++ b/fibers/epoll.scm
@@ -14,9 +14,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers events-impl)
diff --git a/fibers/interrupts.scm b/fibers/interrupts.scm
index 5dceb03..15758b2 100644
--- a/fibers/interrupts.scm
+++ b/fibers/interrupts.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers interrupts)
diff --git a/fibers/io-wakeup.scm b/fibers/io-wakeup.scm
index 5df03f1..1e3b46a 100644
--- a/fibers/io-wakeup.scm
+++ b/fibers/io-wakeup.scm
@@ -13,9 +13,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers io-wakeup)
diff --git a/fibers/libevent.scm b/fibers/libevent.scm
index 306c19f..3b7f7d5 100644
--- a/fibers/libevent.scm
+++ b/fibers/libevent.scm
@@ -14,9 +14,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers events-impl)
diff --git a/fibers/nameset.scm b/fibers/nameset.scm
index 312448d..60c4bb6 100644
--- a/fibers/nameset.scm
+++ b/fibers/nameset.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers nameset)
diff --git a/fibers/operations.scm b/fibers/operations.scm
index ac55507..b5e385f 100644
--- a/fibers/operations.scm
+++ b/fibers/operations.scm
@@ -1,20 +1,19 @@
 ;; Parallel Concurrent ML for Guile
 
 ;;;; Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; An implementation of Parallel Concurrent ML following the 2009
 ;;; ICFP paper "Parallel Concurrent ML" by John Reppy, Claudio
@@ -40,7 +39,7 @@
 ;;;   wrappers explicitly in events, using them to wrap the resume
 ;;;   thunks.  As in the C# implementation, we delay continuation
 ;;;   creation / fiber suspension until after a failed "doFn" phase.
-;;; 
+;;;
 ;;; * In Fibers we do away with the "poll" phase, instead merging it
 ;;;   with the "try" phase.  (Our "try" phase is more like what CML
 ;;;   calls "do".  In Fibers, there is no do; there is only try.)
diff --git a/fibers/posix-clocks-darwin.scm b/fibers/posix-clocks-darwin.scm
index 6a1f36c..c00b3f3 100644
--- a/fibers/posix-clocks-darwin.scm
+++ b/fibers/posix-clocks-darwin.scm
@@ -14,9 +14,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Fibers uses POSIX clocks to be able to preempt schedulers running
 ;;; in other threads after regular timeouts in terms of thread CPU time.
diff --git a/fibers/posix-clocks-generic.scm b/fibers/posix-clocks-generic.scm
index 41f009f..3bda2b1 100644
--- a/fibers/posix-clocks-generic.scm
+++ b/fibers/posix-clocks-generic.scm
@@ -14,9 +14,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Fibers uses POSIX clocks to be able to preempt schedulers running
 ;;; in other threads after regular timeouts in terms of thread CPU time.
diff --git a/fibers/repl.scm b/fibers/repl.scm
index 69ee164..e10e92d 100644
--- a/fibers/repl.scm
+++ b/fibers/repl.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers repl)
diff --git a/fibers/scheduler.scm b/fibers/scheduler.scm
index b5f33e1..1095600 100644
--- a/fibers/scheduler.scm
+++ b/fibers/scheduler.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (fibers scheduler)
diff --git a/fibers/stack.scm b/fibers/stack.scm
index 4375d9c..4f265fc 100644
--- a/fibers/stack.scm
+++ b/fibers/stack.scm
@@ -2,20 +2,19 @@
 
 ;;;; Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
 ;;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (fibers stack)
   #:use-module (ice-9 atomic)
diff --git a/fibers/timers.scm b/fibers/timers.scm
index 8bdbea3..051919e 100644
--- a/fibers/timers.scm
+++ b/fibers/timers.scm
@@ -1,21 +1,20 @@
 ;; Fibers: cooperative, event-driven user-space threads.
 
 ;;;; Copyright (C) 2016 Free Software Foundation, Inc.
-;;;; 
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
-;;;; 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
-;;;; 
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;;;
 
 (define-module (fibers timers)
   #:use-module (fibers scheduler)
diff --git a/fibers/web/server.scm b/fibers/web/server.scm
index 779290b..cfa9c08 100644
--- a/fibers/web/server.scm
+++ b/fibers/web/server.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;;
diff --git a/guix.scm b/guix.scm
index e43f59d..aeabc46 100644
--- a/guix.scm
+++ b/guix.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (ice-9 popen)
              (ice-9 match)
diff --git a/tests/basic.scm b/tests/basic.scm
index 927d4c5..8abda1a 100644
--- a/tests/basic.scm
+++ b/tests/basic.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests basic)
diff --git a/tests/channels.scm b/tests/channels.scm
index 68c98c9..1bfd416 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests channels)
diff --git a/tests/concurrent-web-server.scm b/tests/concurrent-web-server.scm
index e95ac66..b6c4016 100644
--- a/tests/concurrent-web-server.scm
+++ b/tests/concurrent-web-server.scm
@@ -13,9 +13,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests concurrent-web-server)
diff --git a/tests/conditions.scm b/tests/conditions.scm
index 179605a..5905daf 100644
--- a/tests/conditions.scm
+++ b/tests/conditions.scm
@@ -13,9 +13,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests conditions)
diff --git a/tests/foreign.scm b/tests/foreign.scm
index 0d81cb5..cfca5dd 100644
--- a/tests/foreign.scm
+++ b/tests/foreign.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests foreign)
diff --git a/tests/io-wakeup.scm b/tests/io-wakeup.scm
index c14fa81..83f79cd 100644
--- a/tests/io-wakeup.scm
+++ b/tests/io-wakeup.scm
@@ -13,9 +13,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests io-wakeup)
diff --git a/tests/parameters.scm b/tests/parameters.scm
index e0e1b67..0f315c1 100644
--- a/tests/parameters.scm
+++ b/tests/parameters.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests parameters)
diff --git a/tests/ports.scm b/tests/ports.scm
index d659666..aae2842 100644
--- a/tests/ports.scm
+++ b/tests/ports.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests ports)
diff --git a/tests/preemption.scm b/tests/preemption.scm
index e2395cf..5adde96 100644
--- a/tests/preemption.scm
+++ b/tests/preemption.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests parameters)
@@ -55,7 +54,7 @@
 (assert-run-fibers-terminates
  (let lp ((n 0))
    (when (< n #e1e8) (lp (1+ n)))))
-  
+
 (define (race-until n)
   (let ((box (make-atomic-box 0)))
     (spawn-fiber (lambda ()
diff --git a/tests/speedup.scm b/tests/speedup.scm
index 6dfe969..b77555f 100644
--- a/tests/speedup.scm
+++ b/tests/speedup.scm
@@ -12,9 +12,8 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
 ;;;;
-;;;; 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
+;;;; You should have received a copy of the GNU Lesser General Public License
+;;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;
 
 (define-module (tests speedup)
diff --git a/web/server/fibers.scm b/web/server/fibers.scm
index 3652016..1137e66 100644
--- a/web/server/fibers.scm
+++ b/web/server/fibers.scm
@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; 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
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;;