diff --git a/lib/argz.in.h b/lib/argz.in.h
index e89f029..4aceb80 100644
--- a/lib/argz.in.h
+++ b/lib/argz.in.h
@@ -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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef _ARGZ_H
 #define _ARGZ_H	1
diff --git a/lib/atoll.c b/lib/atoll.c
index 89ef25b..2c3d1fb 100644
--- a/lib/atoll.c
+++ b/lib/atoll.c
@@ -11,10 +11,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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 #if !_LIBC
 # include <config.h>
diff --git a/lib/glob-libc.h b/lib/glob-libc.h
index 26a131a..da51fd3 100644
--- a/lib/glob-libc.h
+++ b/lib/glob-libc.h
@@ -11,10 +11,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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef	_GLOB_H
 #define	_GLOB_H	1
diff --git a/lib/glob.c b/lib/glob.c
index 42cd39b..ed03d4b 100644
--- a/lib/glob.c
+++ b/lib/glob.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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef _LIBC
 # include <config.h>
diff --git a/lib/random_r.c b/lib/random_r.c
index 3b1d4b6..7f5e2a8 100644
--- a/lib/random_r.c
+++ b/lib/random_r.c
@@ -11,10 +11,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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 /*
    Copyright (C) 1983 Regents of the University of California.
diff --git a/lib/safe-alloc.c b/lib/safe-alloc.c
index 90c81be..93391cc 100644
--- a/lib/safe-alloc.c
+++ b/lib/safe-alloc.c
@@ -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lib/safe-alloc.h b/lib/safe-alloc.h
index f07ee91..cbfc5c4 100644
--- a/lib/safe-alloc.h
+++ b/lib/safe-alloc.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lib/siglist.h b/lib/siglist.h
index 6673a15..e23e620 100644
--- a/lib/siglist.h
+++ b/lib/siglist.h
@@ -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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 /* This file should be usable for any platform, since it just associates
    the SIG* macros with text names and descriptions.  The actual values
diff --git a/lib/strsignal.c b/lib/strsignal.c
index a7adaba..ee90730 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -11,10 +11,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 the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef _LIBC
 # include <config.h>
diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
index 7760f82..8ab3839 100644
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -1,6 +1,6 @@
 # getdelim.m4 serial 5
 
-dnl Copyright (C) 2005, 2006, 2007 Free Software dnl Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/tests/test-safe-alloc.c b/tests/test-safe-alloc.c
index 97d200a..a9f71c7 100644
--- a/tests/test-safe-alloc.c
+++ b/tests/test-safe-alloc.c
@@ -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: David Lutterkort <address@hidden>
  */
diff --git a/users.txt b/users.txt
index 7597322..6a7761c 100644
--- a/users.txt
+++ b/users.txt
@@ -12,7 +12,8 @@ The following packages appear to be using gnulib and gnulib-tool:
   diffutils       http://cvs.sv.gnu.org/viewcvs/diffutils/diffutils/
   findutils       http://cvs.sv.gnu.org/viewcvs/findutils/findutils/
   gettext         http://cvs.sv.gnu.org/viewcvs/gettext/gettext/
-  gnuit           http://ftp.gnu.org/gnu/gnuit/gnuit-4.9.2.tar.gz
+  gnuit           http://www.gnu.org/software/gnuit/
+                  http://git.savannah.gnu.org/gitweb/?p=gnuit.git
   gnutls          http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/gnutls/?root=GNU+TLS+Library
                   http://git.sv.gnu.org/gitweb/?p=gnutls.git
                   http://repo.or.cz/w/gnutls.git