From 266bdc1f623fe6fe489e5115e0f8ef723705d949 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 18 Nov 2012 06:03:05 -0500
Subject: Replace FSF snail mail address with URLs

This matches a similar change made to glibc.

No functional changes here.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 test/nptl/eintr.c               | 5 ++---
 test/nptl/tst-align.c           | 5 ++---
 test/nptl/tst-align2.c          | 5 ++---
 test/nptl/tst-align3.c          | 5 ++---
 test/nptl/tst-atfork1.c         | 5 ++---
 test/nptl/tst-attr1.c           | 5 ++---
 test/nptl/tst-attr2.c           | 5 ++---
 test/nptl/tst-attr3.c           | 5 ++---
 test/nptl/tst-barrier1.c        | 5 ++---
 test/nptl/tst-barrier2.c        | 5 ++---
 test/nptl/tst-barrier3.c        | 5 ++---
 test/nptl/tst-barrier4.c        | 5 ++---
 test/nptl/tst-basic1.c          | 5 ++---
 test/nptl/tst-basic2.c          | 5 ++---
 test/nptl/tst-basic3.c          | 5 ++---
 test/nptl/tst-basic4.c          | 5 ++---
 test/nptl/tst-basic5.c          | 5 ++---
 test/nptl/tst-basic6.c          | 5 ++---
 test/nptl/tst-cancel1.c         | 5 ++---
 test/nptl/tst-cancel10.c        | 5 ++---
 test/nptl/tst-cancel11.c        | 5 ++---
 test/nptl/tst-cancel12.c        | 5 ++---
 test/nptl/tst-cancel13.c        | 5 ++---
 test/nptl/tst-cancel14.c        | 5 ++---
 test/nptl/tst-cancel15.c        | 5 ++---
 test/nptl/tst-cancel16.c        | 5 ++---
 test/nptl/tst-cancel18.c        | 5 ++---
 test/nptl/tst-cancel19.c        | 5 ++---
 test/nptl/tst-cancel2.c         | 5 ++---
 test/nptl/tst-cancel20.c        | 5 ++---
 test/nptl/tst-cancel21.c        | 5 ++---
 test/nptl/tst-cancel22.c        | 5 ++---
 test/nptl/tst-cancel3.c         | 5 ++---
 test/nptl/tst-cancel4.c         | 5 ++---
 test/nptl/tst-cancel6.c         | 5 ++---
 test/nptl/tst-cancel7.c         | 5 ++---
 test/nptl/tst-cancel8.c         | 5 ++---
 test/nptl/tst-cancel9.c         | 5 ++---
 test/nptl/tst-cleanup0.c        | 5 ++---
 test/nptl/tst-cleanup1.c        | 5 ++---
 test/nptl/tst-cleanup2.c        | 5 ++---
 test/nptl/tst-cleanup3.c        | 5 ++---
 test/nptl/tst-cleanup4.c        | 5 ++---
 test/nptl/tst-cleanup4aux.c     | 5 ++---
 test/nptl/tst-clock.c           | 5 ++---
 test/nptl/tst-clock1.c          | 5 ++---
 test/nptl/tst-clock2.c          | 5 ++---
 test/nptl/tst-clock_nanosleep.c | 5 ++---
 test/nptl/tst-cond1.c           | 5 ++---
 test/nptl/tst-cond10.c          | 5 ++---
 test/nptl/tst-cond11.c          | 5 ++---
 test/nptl/tst-cond12.c          | 5 ++---
 test/nptl/tst-cond14.c          | 5 ++---
 test/nptl/tst-cond15.c          | 5 ++---
 test/nptl/tst-cond16.c          | 5 ++---
 test/nptl/tst-cond18.c          | 5 ++---
 test/nptl/tst-cond19.c          | 5 ++---
 test/nptl/tst-cond2.c           | 5 ++---
 test/nptl/tst-cond20.c          | 5 ++---
 test/nptl/tst-cond23.c          | 5 ++---
 test/nptl/tst-cond3.c           | 5 ++---
 test/nptl/tst-cond4.c           | 5 ++---
 test/nptl/tst-cond5.c           | 5 ++---
 test/nptl/tst-cond6.c           | 5 ++---
 test/nptl/tst-cond7.c           | 5 ++---
 test/nptl/tst-cond8.c           | 5 ++---
 test/nptl/tst-cond9.c           | 5 ++---
 test/nptl/tst-cpuclock1.c       | 5 ++---
 test/nptl/tst-cpuclock2.c       | 5 ++---
 test/nptl/tst-detach1.c         | 5 ++---
 test/nptl/tst-eintr1.c          | 5 ++---
 test/nptl/tst-eintr2.c          | 5 ++---
 test/nptl/tst-eintr3.c          | 5 ++---
 test/nptl/tst-eintr4.c          | 5 ++---
 test/nptl/tst-eintr5.c          | 5 ++---
 test/nptl/tst-exec2.c           | 5 ++---
 test/nptl/tst-exec3.c           | 5 ++---
 test/nptl/tst-exec4.c           | 5 ++---
 test/nptl/tst-exit1.c           | 5 ++---
 test/nptl/tst-fini1.c           | 5 ++---
 test/nptl/tst-fini1mod.c        | 5 ++---
 test/nptl/tst-flock1.c          | 5 ++---
 test/nptl/tst-flock2.c          | 5 ++---
 test/nptl/tst-fork1.c           | 5 ++---
 test/nptl/tst-fork2.c           | 5 ++---
 test/nptl/tst-fork3.c           | 5 ++---
 test/nptl/tst-fork4.c           | 5 ++---
 test/nptl/tst-initializers1.c   | 5 ++---
 test/nptl/tst-join1.c           | 5 ++---
 test/nptl/tst-join2.c           | 5 ++---
 test/nptl/tst-join3.c           | 5 ++---
 test/nptl/tst-join4.c           | 5 ++---
 test/nptl/tst-join5.c           | 5 ++---
 test/nptl/tst-key1.c            | 5 ++---
 test/nptl/tst-key2.c            | 5 ++---
 test/nptl/tst-key3.c            | 5 ++---
 test/nptl/tst-key4.c            | 5 ++---
 test/nptl/tst-kill1.c           | 5 ++---
 test/nptl/tst-kill2.c           | 5 ++---
 test/nptl/tst-kill3.c           | 5 ++---
 test/nptl/tst-kill4.c           | 5 ++---
 test/nptl/tst-kill5.c           | 5 ++---
 test/nptl/tst-kill6.c           | 5 ++---
 test/nptl/tst-mqueue.h          | 5 ++---
 test/nptl/tst-mqueue1.c         | 5 ++---
 test/nptl/tst-mqueue2.c         | 5 ++---
 test/nptl/tst-mqueue3.c         | 5 ++---
 test/nptl/tst-mqueue4.c         | 5 ++---
 test/nptl/tst-mqueue5.c         | 5 ++---
 test/nptl/tst-mqueue6.c         | 5 ++---
 test/nptl/tst-mqueue7.c         | 5 ++---
 test/nptl/tst-mqueue8.c         | 5 ++---
 test/nptl/tst-mqueue9.c         | 5 ++---
 test/nptl/tst-mutex1.c          | 5 ++---
 test/nptl/tst-mutex2.c          | 5 ++---
 test/nptl/tst-mutex3.c          | 5 ++---
 test/nptl/tst-mutex4.c          | 5 ++---
 test/nptl/tst-mutex5.c          | 5 ++---
 test/nptl/tst-mutex6.c          | 5 ++---
 test/nptl/tst-mutex7.c          | 5 ++---
 test/nptl/tst-mutex8.c          | 5 ++---
 test/nptl/tst-mutex9.c          | 5 ++---
 test/nptl/tst-once1.c           | 5 ++---
 test/nptl/tst-once2.c           | 5 ++---
 test/nptl/tst-once3.c           | 5 ++---
 test/nptl/tst-once4.c           | 5 ++---
 test/nptl/tst-popen1.c          | 5 ++---
 test/nptl/tst-raise1.c          | 5 ++---
 test/nptl/tst-rwlock1.c         | 5 ++---
 test/nptl/tst-rwlock10.c        | 5 ++---
 test/nptl/tst-rwlock11.c        | 5 ++---
 test/nptl/tst-rwlock12.c        | 5 ++---
 test/nptl/tst-rwlock13.c        | 5 ++---
 test/nptl/tst-rwlock14.c        | 5 ++---
 test/nptl/tst-rwlock2.c         | 5 ++---
 test/nptl/tst-rwlock3.c         | 5 ++---
 test/nptl/tst-rwlock4.c         | 5 ++---
 test/nptl/tst-rwlock5.c         | 5 ++---
 test/nptl/tst-rwlock6.c         | 5 ++---
 test/nptl/tst-rwlock7.c         | 5 ++---
 test/nptl/tst-rwlock8.c         | 5 ++---
 test/nptl/tst-rwlock9.c         | 5 ++---
 test/nptl/tst-sched1.c          | 5 ++---
 test/nptl/tst-sem1.c            | 5 ++---
 test/nptl/tst-sem10.c           | 5 ++---
 test/nptl/tst-sem2.c            | 5 ++---
 test/nptl/tst-sem3.c            | 5 ++---
 test/nptl/tst-sem4.c            | 5 ++---
 test/nptl/tst-sem5.c            | 5 ++---
 test/nptl/tst-sem6.c            | 5 ++---
 test/nptl/tst-sem7.c            | 5 ++---
 test/nptl/tst-sem8.c            | 5 ++---
 test/nptl/tst-sem9.c            | 5 ++---
 test/nptl/tst-signal1.c         | 5 ++---
 test/nptl/tst-signal2.c         | 5 ++---
 test/nptl/tst-signal3.c         | 5 ++---
 test/nptl/tst-signal4.c         | 5 ++---
 test/nptl/tst-signal5.c         | 5 ++---
 test/nptl/tst-signal6.c         | 5 ++---
 test/nptl/tst-signal7.c         | 5 ++---
 test/nptl/tst-spin1.c           | 5 ++---
 test/nptl/tst-spin2.c           | 5 ++---
 test/nptl/tst-spin3.c           | 5 ++---
 test/nptl/tst-stack-align.h     | 5 ++---
 test/nptl/tst-stack1.c          | 5 ++---
 test/nptl/tst-stack2.c          | 5 ++---
 test/nptl/tst-stdio1.c          | 5 ++---
 test/nptl/tst-stdio2.c          | 5 ++---
 test/nptl/tst-sysconf.c         | 5 ++---
 test/nptl/tst-timer4.c          | 5 ++---
 test/nptl/tst-tls1.c            | 5 ++---
 test/nptl/tst-tls2.c            | 5 ++---
 test/nptl/tst-tls3.c            | 5 ++---
 test/nptl/tst-tls3mod.c         | 5 ++---
 test/nptl/tst-tls4.c            | 5 ++---
 test/nptl/tst-tls4moda.c        | 5 ++---
 test/nptl/tst-tls4modb.c        | 5 ++---
 test/nptl/tst-tls5.c            | 5 ++---
 test/nptl/tst-tsd1.c            | 5 ++---
 test/nptl/tst-tsd2.c            | 5 ++---
 test/nptl/tst-tsd3.c            | 5 ++---
 test/nptl/tst-tsd4.c            | 5 ++---
 test/nptl/tst-tsd5.c            | 5 ++---
 test/nptl/tst-typesizes.c       | 5 ++---
 test/nptl/tst-umask1.c          | 5 ++---
 test/nptl/tst-unload.c          | 5 ++---
 test/nptl/tst-vfork1.c          | 5 ++---
 test/nptl/tst-vfork1x.c         | 5 ++---
 test/nptl/tst-vfork2.c          | 5 ++---
 test/nptl/tst-vfork2x.c         | 5 ++---
 190 files changed, 380 insertions(+), 570 deletions(-)

(limited to 'test/nptl')

diff --git a/test/nptl/eintr.c b/test/nptl/eintr.c
index 933c5d81b..d6425b51b 100644
--- a/test/nptl/eintr.c
+++ b/test/nptl/eintr.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-align.c b/test/nptl/tst-align.c
index 381db8f4e..df66b38b7 100644
--- a/test/nptl/tst-align.c
+++ b/test/nptl/tst-align.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdbool.h>
diff --git a/test/nptl/tst-align2.c b/test/nptl/tst-align2.c
index 7d8be53da..7d3a09913 100644
--- a/test/nptl/tst-align2.c
+++ b/test/nptl/tst-align2.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sched.h>
 #include <stdbool.h>
diff --git a/test/nptl/tst-align3.c b/test/nptl/tst-align3.c
index f4507f2eb..fb0a8e4ec 100644
--- a/test/nptl/tst-align3.c
+++ b/test/nptl/tst-align3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdbool.h>
diff --git a/test/nptl/tst-atfork1.c b/test/nptl/tst-atfork1.c
index b42ab4246..129893747 100644
--- a/test/nptl/tst-atfork1.c
+++ b/test/nptl/tst-atfork1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-attr1.c b/test/nptl/tst-attr1.c
index 13b62a69d..987f87ff5 100644
--- a/test/nptl/tst-attr1.c
+++ b/test/nptl/tst-attr1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-attr2.c b/test/nptl/tst-attr2.c
index a60598dd7..e8f9cc986 100644
--- a/test/nptl/tst-attr2.c
+++ b/test/nptl/tst-attr2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-attr3.c b/test/nptl/tst-attr3.c
index 29b4bbe37..5ccf9abba 100644
--- a/test/nptl/tst-attr3.c
+++ b/test/nptl/tst-attr3.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <error.h>
diff --git a/test/nptl/tst-barrier1.c b/test/nptl/tst-barrier1.c
index 2859fb4ca..4e396c97a 100644
--- a/test/nptl/tst-barrier1.c
+++ b/test/nptl/tst-barrier1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-barrier2.c b/test/nptl/tst-barrier2.c
index 7f588694d..8ffcda063 100644
--- a/test/nptl/tst-barrier2.c
+++ b/test/nptl/tst-barrier2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-barrier3.c b/test/nptl/tst-barrier3.c
index b5478f827..9c4e2b25f 100644
--- a/test/nptl/tst-barrier3.c
+++ b/test/nptl/tst-barrier3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Test of POSIX barriers.  */
 
diff --git a/test/nptl/tst-barrier4.c b/test/nptl/tst-barrier4.c
index efc27551c..cad9fb727 100644
--- a/test/nptl/tst-barrier4.c
+++ b/test/nptl/tst-barrier4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* This is a test for behavior not guaranteed by POSIX.  */
 #include <errno.h>
diff --git a/test/nptl/tst-basic1.c b/test/nptl/tst-basic1.c
index 7637c8e49..748bbb7f0 100644
--- a/test/nptl/tst-basic1.c
+++ b/test/nptl/tst-basic1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-basic2.c b/test/nptl/tst-basic2.c
index 1c4632ceb..58ed6ac53 100644
--- a/test/nptl/tst-basic2.c
+++ b/test/nptl/tst-basic2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-basic3.c b/test/nptl/tst-basic3.c
index cb4816d2a..a3e2603bd 100644
--- a/test/nptl/tst-basic3.c
+++ b/test/nptl/tst-basic3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-basic4.c b/test/nptl/tst-basic4.c
index 6eb6ea9f1..b69ca200b 100644
--- a/test/nptl/tst-basic4.c
+++ b/test/nptl/tst-basic4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-basic5.c b/test/nptl/tst-basic5.c
index 83a8810f1..76b59096e 100644
--- a/test/nptl/tst-basic5.c
+++ b/test/nptl/tst-basic5.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-basic6.c b/test/nptl/tst-basic6.c
index 413ae034b..91e5fe2c7 100644
--- a/test/nptl/tst-basic6.c
+++ b/test/nptl/tst-basic6.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cancel1.c b/test/nptl/tst-cancel1.c
index 690319d8c..8b2ca07b1 100644
--- a/test/nptl/tst-cancel1.c
+++ b/test/nptl/tst-cancel1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-cancel10.c b/test/nptl/tst-cancel10.c
index 7af0f2f84..534ddf439 100644
--- a/test/nptl/tst-cancel10.c
+++ b/test/nptl/tst-cancel10.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cancel11.c b/test/nptl/tst-cancel11.c
index 235aef5c4..c09158237 100644
--- a/test/nptl/tst-cancel11.c
+++ b/test/nptl/tst-cancel11.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel12.c b/test/nptl/tst-cancel12.c
index 6fdf5cf5f..8b3faa607 100644
--- a/test/nptl/tst-cancel12.c
+++ b/test/nptl/tst-cancel12.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel13.c b/test/nptl/tst-cancel13.c
index 66ab45509..cf3ce20f5 100644
--- a/test/nptl/tst-cancel13.c
+++ b/test/nptl/tst-cancel13.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel14.c b/test/nptl/tst-cancel14.c
index 592c0864f..defbbdd84 100644
--- a/test/nptl/tst-cancel14.c
+++ b/test/nptl/tst-cancel14.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel15.c b/test/nptl/tst-cancel15.c
index 5fd95022b..eb2d713e6 100644
--- a/test/nptl/tst-cancel15.c
+++ b/test/nptl/tst-cancel15.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel16.c b/test/nptl/tst-cancel16.c
index 709902e97..6af657c47 100644
--- a/test/nptl/tst-cancel16.c
+++ b/test/nptl/tst-cancel16.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel18.c b/test/nptl/tst-cancel18.c
index 15e9ddfbb..e653119d6 100644
--- a/test/nptl/tst-cancel18.c
+++ b/test/nptl/tst-cancel18.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel19.c b/test/nptl/tst-cancel19.c
index b346f602d..921df3f9d 100644
--- a/test/nptl/tst-cancel19.c
+++ b/test/nptl/tst-cancel19.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <error.h>
diff --git a/test/nptl/tst-cancel2.c b/test/nptl/tst-cancel2.c
index 6d80f8ae5..45c9e8ea9 100644
--- a/test/nptl/tst-cancel2.c
+++ b/test/nptl/tst-cancel2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-cancel20.c b/test/nptl/tst-cancel20.c
index d88cb9caf..7e9199fe5 100644
--- a/test/nptl/tst-cancel20.c
+++ b/test/nptl/tst-cancel20.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel21.c b/test/nptl/tst-cancel21.c
index cc00cc168..489c18ab0 100644
--- a/test/nptl/tst-cancel21.c
+++ b/test/nptl/tst-cancel21.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel22.c b/test/nptl/tst-cancel22.c
index c47167b90..8febbf0e1 100644
--- a/test/nptl/tst-cancel22.c
+++ b/test/nptl/tst-cancel22.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cancel3.c b/test/nptl/tst-cancel3.c
index 86c482bcc..e1c111d29 100644
--- a/test/nptl/tst-cancel3.c
+++ b/test/nptl/tst-cancel3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-cancel4.c b/test/nptl/tst-cancel4.c
index c0f1cd88c..874de67e7 100644
--- a/test/nptl/tst-cancel4.c
+++ b/test/nptl/tst-cancel4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* NOTE: this tests functionality beyond POSIX.  POSIX does not allow
    exit to be called more than once.  */
diff --git a/test/nptl/tst-cancel6.c b/test/nptl/tst-cancel6.c
index 94de85830..4e11277ea 100644
--- a/test/nptl/tst-cancel6.c
+++ b/test/nptl/tst-cancel6.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index 16cc47cff..3bdfa9fa6 100644
--- a/test/nptl/tst-cancel7.c
+++ b/test/nptl/tst-cancel7.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/test/nptl/tst-cancel8.c b/test/nptl/tst-cancel8.c
index fc836627d..1c91d47a0 100644
--- a/test/nptl/tst-cancel8.c
+++ b/test/nptl/tst-cancel8.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cancel9.c b/test/nptl/tst-cancel9.c
index 037ef30fd..40a62c588 100644
--- a/test/nptl/tst-cancel9.c
+++ b/test/nptl/tst-cancel9.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <fcntl.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cleanup0.c b/test/nptl/tst-cleanup0.c
index 6fc2209cc..401115d73 100644
--- a/test/nptl/tst-cleanup0.c
+++ b/test/nptl/tst-cleanup0.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cleanup1.c b/test/nptl/tst-cleanup1.c
index 2230e0fbe..e89f434f5 100644
--- a/test/nptl/tst-cleanup1.c
+++ b/test/nptl/tst-cleanup1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cleanup2.c b/test/nptl/tst-cleanup2.c
index 30e10b120..d01301b9f 100644
--- a/test/nptl/tst-cleanup2.c
+++ b/test/nptl/tst-cleanup2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <setjmp.h>
 #include <signal.h>
diff --git a/test/nptl/tst-cleanup3.c b/test/nptl/tst-cleanup3.c
index c44277370..67bd9eb6f 100644
--- a/test/nptl/tst-cleanup3.c
+++ b/test/nptl/tst-cleanup3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cleanup4.c b/test/nptl/tst-cleanup4.c
index 1489fd31b..3fe399820 100644
--- a/test/nptl/tst-cleanup4.c
+++ b/test/nptl/tst-cleanup4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cleanup4aux.c b/test/nptl/tst-cleanup4aux.c
index cd1a89ac1..029c4939f 100644
--- a/test/nptl/tst-cleanup4aux.c
+++ b/test/nptl/tst-cleanup4aux.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-clock.c b/test/nptl/tst-clock.c
index f2f18874a..2023cbc6d 100644
--- a/test/nptl/tst-clock.c
+++ b/test/nptl/tst-clock.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/test/nptl/tst-clock1.c b/test/nptl/tst-clock1.c
index 0848d7701..7e483b534 100644
--- a/test/nptl/tst-clock1.c
+++ b/test/nptl/tst-clock1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-clock2.c b/test/nptl/tst-clock2.c
index bca40956e..df6ec00db 100644
--- a/test/nptl/tst-clock2.c
+++ b/test/nptl/tst-clock2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-clock_nanosleep.c b/test/nptl/tst-clock_nanosleep.c
index 98a8b5f57..a2d1f0085 100644
--- a/test/nptl/tst-clock_nanosleep.c
+++ b/test/nptl/tst-clock_nanosleep.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cond1.c b/test/nptl/tst-cond1.c
index 46085c2b7..30efe5b5e 100644
--- a/test/nptl/tst-cond1.c
+++ b/test/nptl/tst-cond1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <error.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond10.c b/test/nptl/tst-cond10.c
index 34956d468..cd5247727 100644
--- a/test/nptl/tst-cond10.c
+++ b/test/nptl/tst-cond10.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <error.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond11.c b/test/nptl/tst-cond11.c
index 0de4d5613..4aaf38002 100644
--- a/test/nptl/tst-cond11.c
+++ b/test/nptl/tst-cond11.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond12.c b/test/nptl/tst-cond12.c
index 03e4881c9..b38d9d5ec 100644
--- a/test/nptl/tst-cond12.c
+++ b/test/nptl/tst-cond12.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond14.c b/test/nptl/tst-cond14.c
index 106fa8c21..837840582 100644
--- a/test/nptl/tst-cond14.c
+++ b/test/nptl/tst-cond14.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cond15.c b/test/nptl/tst-cond15.c
index e815e253b..0e8448c11 100644
--- a/test/nptl/tst-cond15.c
+++ b/test/nptl/tst-cond15.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond16.c b/test/nptl/tst-cond16.c
index 00c27eced..44b98634b 100644
--- a/test/nptl/tst-cond16.c
+++ b/test/nptl/tst-cond16.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond18.c b/test/nptl/tst-cond18.c
index 9fd81d298..a1bb947ac 100644
--- a/test/nptl/tst-cond18.c
+++ b/test/nptl/tst-cond18.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/test/nptl/tst-cond19.c b/test/nptl/tst-cond19.c
index 1c9bb7dd7..200e0eaf0 100644
--- a/test/nptl/tst-cond19.c
+++ b/test/nptl/tst-cond19.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond2.c b/test/nptl/tst-cond2.c
index 36f0f2941..1da074cdd 100644
--- a/test/nptl/tst-cond2.c
+++ b/test/nptl/tst-cond2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <error.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond20.c b/test/nptl/tst-cond20.c
index 18918f32e..c1341a07b 100644
--- a/test/nptl/tst-cond20.c
+++ b/test/nptl/tst-cond20.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cond23.c b/test/nptl/tst-cond23.c
index 254d821cc..fb2936f00 100644
--- a/test/nptl/tst-cond23.c
+++ b/test/nptl/tst-cond23.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond3.c b/test/nptl/tst-cond3.c
index cb9eb8558..b18183121 100644
--- a/test/nptl/tst-cond3.c
+++ b/test/nptl/tst-cond3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-cond4.c b/test/nptl/tst-cond4.c
index 4d8859616..47a7380de 100644
--- a/test/nptl/tst-cond4.c
+++ b/test/nptl/tst-cond4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond5.c b/test/nptl/tst-cond5.c
index efa207b5d..7da5b4110 100644
--- a/test/nptl/tst-cond5.c
+++ b/test/nptl/tst-cond5.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond6.c b/test/nptl/tst-cond6.c
index 8c5fe2093..f28d4c157 100644
--- a/test/nptl/tst-cond6.c
+++ b/test/nptl/tst-cond6.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond7.c b/test/nptl/tst-cond7.c
index 5ab7b8f8f..c48fda13c 100644
--- a/test/nptl/tst-cond7.c
+++ b/test/nptl/tst-cond7.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond8.c b/test/nptl/tst-cond8.c
index 9c97a96fa..fb13fa46c 100644
--- a/test/nptl/tst-cond8.c
+++ b/test/nptl/tst-cond8.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cond9.c b/test/nptl/tst-cond9.c
index 2a8477dd8..dcb597ddf 100644
--- a/test/nptl/tst-cond9.c
+++ b/test/nptl/tst-cond9.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-cpuclock1.c b/test/nptl/tst-cpuclock1.c
index 024df6314..9d68ec520 100644
--- a/test/nptl/tst-cpuclock1.c
+++ b/test/nptl/tst-cpuclock1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/nptl/tst-cpuclock2.c b/test/nptl/tst-cpuclock2.c
index d1621f3d0..d08dc6211 100644
--- a/test/nptl/tst-cpuclock2.c
+++ b/test/nptl/tst-cpuclock2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
diff --git a/test/nptl/tst-detach1.c b/test/nptl/tst-detach1.c
index 7b27f6ead..90a69fffd 100644
--- a/test/nptl/tst-detach1.c
+++ b/test/nptl/tst-detach1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-eintr1.c b/test/nptl/tst-eintr1.c
index 43a5df5b9..ac381a88b 100644
--- a/test/nptl/tst-eintr1.c
+++ b/test/nptl/tst-eintr1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-eintr2.c b/test/nptl/tst-eintr2.c
index 8cbbc5a02..f20c70922 100644
--- a/test/nptl/tst-eintr2.c
+++ b/test/nptl/tst-eintr2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-eintr3.c b/test/nptl/tst-eintr3.c
index eecab48b1..31497603b 100644
--- a/test/nptl/tst-eintr3.c
+++ b/test/nptl/tst-eintr3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-eintr4.c b/test/nptl/tst-eintr4.c
index dffbdd605..f2290f9d0 100644
--- a/test/nptl/tst-eintr4.c
+++ b/test/nptl/tst-eintr4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-eintr5.c b/test/nptl/tst-eintr5.c
index 91473ec4c..f7cb76274 100644
--- a/test/nptl/tst-eintr5.c
+++ b/test/nptl/tst-eintr5.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-exec2.c b/test/nptl/tst-exec2.c
index 432da32ef..061e3fc7c 100644
--- a/test/nptl/tst-exec2.c
+++ b/test/nptl/tst-exec2.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <paths.h>
diff --git a/test/nptl/tst-exec3.c b/test/nptl/tst-exec3.c
index be49b048c..be4098b32 100644
--- a/test/nptl/tst-exec3.c
+++ b/test/nptl/tst-exec3.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <paths.h>
diff --git a/test/nptl/tst-exec4.c b/test/nptl/tst-exec4.c
index b3920a030..b5d290f77 100644
--- a/test/nptl/tst-exec4.c
+++ b/test/nptl/tst-exec4.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/test/nptl/tst-exit1.c b/test/nptl/tst-exit1.c
index 44175f76c..7f0fe7954 100644
--- a/test/nptl/tst-exit1.c
+++ b/test/nptl/tst-exit1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* NOTE: this tests functionality beyond POSIX.  POSIX does not allow
    exit to be called more than once.  */
diff --git a/test/nptl/tst-fini1.c b/test/nptl/tst-fini1.c
index bec4be1d3..b8c7a7306 100644
--- a/test/nptl/tst-fini1.c
+++ b/test/nptl/tst-fini1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
diff --git a/test/nptl/tst-fini1mod.c b/test/nptl/tst-fini1mod.c
index 492d9ffb8..669c9af4c 100644
--- a/test/nptl/tst-fini1mod.c
+++ b/test/nptl/tst-fini1mod.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-flock1.c b/test/nptl/tst-flock1.c
index ed2472d3a..e271c8023 100644
--- a/test/nptl/tst-flock1.c
+++ b/test/nptl/tst-flock1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-flock2.c b/test/nptl/tst-flock2.c
index 8ef3206cc..941c52ffe 100644
--- a/test/nptl/tst-flock2.c
+++ b/test/nptl/tst-flock2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-fork1.c b/test/nptl/tst-fork1.c
index 33c4ed84f..0d8972831 100644
--- a/test/nptl/tst-fork1.c
+++ b/test/nptl/tst-fork1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-fork2.c b/test/nptl/tst-fork2.c
index 07d6c2266..d85ea21e1 100644
--- a/test/nptl/tst-fork2.c
+++ b/test/nptl/tst-fork2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-fork3.c b/test/nptl/tst-fork3.c
index bc73853a5..968d0ab98 100644
--- a/test/nptl/tst-fork3.c
+++ b/test/nptl/tst-fork3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-fork4.c b/test/nptl/tst-fork4.c
index cca19f406..ee87108a1 100644
--- a/test/nptl/tst-fork4.c
+++ b/test/nptl/tst-fork4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-initializers1.c b/test/nptl/tst-initializers1.c
index ccd27286e..1e353806b 100644
--- a/test/nptl/tst-initializers1.c
+++ b/test/nptl/tst-initializers1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 
diff --git a/test/nptl/tst-join1.c b/test/nptl/tst-join1.c
index 95a78ba0b..681245a1c 100644
--- a/test/nptl/tst-join1.c
+++ b/test/nptl/tst-join1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/test/nptl/tst-join2.c b/test/nptl/tst-join2.c
index 2cfab8b0e..03203983c 100644
--- a/test/nptl/tst-join2.c
+++ b/test/nptl/tst-join2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-join3.c b/test/nptl/tst-join3.c
index df1135fb5..b25ffd8ba 100644
--- a/test/nptl/tst-join3.c
+++ b/test/nptl/tst-join3.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-join4.c b/test/nptl/tst-join4.c
index b13a51011..96b650ddc 100644
--- a/test/nptl/tst-join4.c
+++ b/test/nptl/tst-join4.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-join5.c b/test/nptl/tst-join5.c
index b08af6e43..feeee2ee3 100644
--- a/test/nptl/tst-join5.c
+++ b/test/nptl/tst-join5.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-key1.c b/test/nptl/tst-key1.c
index dfbe58417..ebda39533 100644
--- a/test/nptl/tst-key1.c
+++ b/test/nptl/tst-key1.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <limits.h>
 #include <pthread.h>
diff --git a/test/nptl/tst-key2.c b/test/nptl/tst-key2.c
index c5493322c..c32031e60 100644
--- a/test/nptl/tst-key2.c
+++ b/test/nptl/tst-key2.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if