Update FSF postal mail address.

261 files changed, 263 insertions, 263 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fb5de087d..d307078c8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,8 +14,8 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 
 noinst_LIBRARIES = libcoreutils.a
 
diff --git a/lib/__fpending.c b/lib/__fpending.c
index 007302c8c..0769f2314 100644
--- a/lib/__fpending.c
+++ b/lib/__fpending.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/acl.c b/lib/acl.c
index 45f58be42..4e759cdde 100644
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/acl.h b/lib/acl.h
index 72a0da76b..c9bb3c7df 100644
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/alloca_.h b/lib/alloca_.h
index 799037ce0..3e3fdf43f 100644
--- a/lib/alloca_.h
+++ b/lib/alloca_.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
diff --git a/lib/allocsa.c b/lib/allocsa.c
index 55f6b80da..30677bd5f 100644
--- a/lib/allocsa.c
+++ b/lib/allocsa.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/allocsa.h b/lib/allocsa.h
index 5ae49e507..cb6893ad1 100644
--- a/lib/allocsa.h
+++ b/lib/allocsa.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ALLOCSA_H
 #define _ALLOCSA_H
diff --git a/lib/argmatch.c b/lib/argmatch.c
index bc223d87a..db883ac41 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
diff --git a/lib/argmatch.h b/lib/argmatch.h
index 8952394fd..ea0f46800 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
diff --git a/lib/asnprintf.c b/lib/asnprintf.c
index 4881a9238..1b7f4ba39 100644
--- a/lib/asnprintf.c
+++ b/lib/asnprintf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/asprintf.c b/lib/asprintf.c
index 5935c53e6..7c4e64a24 100644
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/backupfile.c b/lib/backupfile.c
index 26ae204e5..449fb5941 100644
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert and David MacKenzie.
    Some algorithms adapted from GNU Emacs.  */
diff --git a/lib/backupfile.h b/lib/backupfile.h
index d217bca00..7b44e5806 100644
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef BACKUPFILE_H_
 # define BACKUPFILE_H_
diff --git a/lib/basename.c b/lib/basename.c
index adb9f02ff..b6de3d610 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 7e03b4a26..031f5f877 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/calloc.c b/lib/calloc.c
index 1ff0f1c0b..59c65f0ac 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/canon-host.c b/lib/canon-host.c
index db1dd0f42..a36428db6 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 9e8947003..ba60248d9 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/canonicalize.h b/lib/canonicalize.h
index 2f73de0ea..4c9596f98 100644
--- a/lib/canonicalize.h
+++ b/lib/canonicalize.h
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef CANONICALIZE_H_
 # define CANONICALIZE_H_
diff --git a/lib/chdir-long.c b/lib/chdir-long.c
index c3e71fded..2cc70fa53 100644
--- a/lib/chdir-long.c
+++ b/lib/chdir-long.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/chdir-long.h b/lib/chdir-long.h
index 56c7bfdc6..4852b40d1 100644
--- a/lib/chdir-long.h
+++ b/lib/chdir-long.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/chown.c b/lib/chown.c
index 2b6b29d46..22272bd16 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/cloexec.c b/lib/cloexec.c
index e07cdd3d5..bc55d7521 100644
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    The code is taken from glibc/manual/llio.texi  */
 
diff --git a/lib/closeout.c b/lib/closeout.c
index 14aa1d362..fb7d2bb42 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/closeout.h b/lib/closeout.h
index 1b715ee30..589a14f42 100644
--- a/lib/closeout.h
+++ b/lib/closeout.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef CLOSEOUT_H
 # define CLOSEOUT_H 1
diff --git a/lib/config.charset b/lib/config.charset
index b3ce2ba93..98294583d 100755
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -15,7 +15,7 @@
 #
 #   You should have received a copy of the GNU General Public License along
 #   with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
diff --git a/lib/cycle-check.c b/lib/cycle-check.c
index 49687a519..1c6e17cac 100644
--- a/lib/cycle-check.c
+++ b/lib/cycle-check.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering */
 
diff --git a/lib/cycle-check.h b/lib/cycle-check.h
index 7b7f54d14..0551bf265 100644
--- a/lib/cycle-check.h
+++ b/lib/cycle-check.h
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering */
 
diff --git a/lib/diacrit.c b/lib/diacrit.c
index e3735a408..87dca2bc7 100644
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/diacrit.h b/lib/diacrit.h
index db9886ab9..54eb60fad 100644
--- a/lib/diacrit.h
+++ b/lib/diacrit.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 extern const char diacrit_base[]; /* characters without diacritics */
 extern const char diacrit_diac[]; /* diacritic code for each character */
diff --git a/lib/dirfd.c b/lib/dirfd.c
index 29761bf72..d65a35c3e 100644
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/dirfd.h b/lib/dirfd.h
index 714f69624..ce5ab2903 100644
--- a/lib/dirfd.h
+++ b/lib/dirfd.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering.  */
 
diff --git a/lib/dirname.c b/lib/dirname.c
index 7671a0d62..9b6007656 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/dirname.h b/lib/dirname.h
index bc2400a7d..5c3c93050 100644
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software Foundation,
-    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 10c17fcd9..e51a8d5f5 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/dup2.c b/lib/dup2.c
index 6d3e4fc53..c5d418f02 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/error.c b/lib/error.c
index 6b3662d61..45698be8d 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
diff --git a/lib/error.h b/lib/error.h
index 8ed63595f..e5220a2f1 100644
--- a/lib/error.h
+++ b/lib/error.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ERROR_H
 #define _ERROR_H 1
diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index 978ab560a..7f8c238e2 100644
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */
diff --git a/lib/exclude.c b/lib/exclude.c
index 24146eb93..39101c783 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com>  */
 
diff --git a/lib/exclude.h b/lib/exclude.h
index a7e297110..784d4389c 100644
--- a/lib/exclude.h
+++ b/lib/exclude.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com>  */
 
diff --git a/lib/exit.h b/lib/exit.h
index 4e8d46516..9dbfb7ce8 100644
--- a/lib/exit.h
+++ b/lib/exit.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _EXIT_H
 #define _EXIT_H
diff --git a/lib/exitfail.c b/lib/exitfail.c
index 2ae5f6955..1c5997b8a 100644
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/exitfail.h b/lib/exitfail.h
index cf5ab7195..e46cf9c16 100644
--- a/lib/exitfail.h
+++ b/lib/exitfail.h
@@ -15,6 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 extern int volatile exit_failure;
diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 02caaa940..93768600f 100644
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/file-type.c b/lib/file-type.c
index 93fff71b1..0a6c3ee77 100644
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/file-type.h b/lib/file-type.h
index ebbe95b4f..1f4ca3da6 100644
--- a/lib/file-type.h
+++ b/lib/file-type.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 72e78a5e1..dd6fb6d3a 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 
diff --git a/lib/filemode.c b/lib/filemode.c
index 0e38e3af3..a5485b401 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/filemode.h b/lib/filemode.h
index 10b2ef961..5d3da6703 100644
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef FILEMODE_H_
 
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 011a14503..60031e9b8 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/fnmatch_.h b/lib/fnmatch_.h
index 87e661f72..a88d323a3 100644
--- a/lib/fnmatch_.h
+++ b/lib/fnmatch_.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef	_FNMATCH_H
 # define _FNMATCH_H	1
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index 7cea5a76e..feb73c1b1 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Match STRING against the filename pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index c5c97c8a1..1eb594b32 100644
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/free.c b/lib/free.c
index 0fc9d8ba5..9e3435640 100644
--- a/lib/free.c
+++ b/lib/free.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/fsusage.c b/lib/fsusage.c
index a07618c8c..d2a6cc21f 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/fsusage.h b/lib/fsusage.h
index 7528b8902..2d4172a39 100644
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Space usage statistics for a file system.  Blocks are 512-byte. */
 
diff --git a/lib/fts.c b/lib/fts.c
index f82ef0fe3..26df1d7a8 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
diff --git a/lib/fts_.h b/lib/fts_.h
index f95d9fc40..b932cf77b 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/lib/full-read.c b/lib/full-read.c
index 1dc3e3775..8c3472a40 100644
--- a/lib/full-read.c
+++ b/lib/full-read.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define FULL_READ
 #include "full-write.c"
diff --git a/lib/full-read.h b/lib/full-read.h
index 71f19a3bd..05d83a762 100644
--- a/lib/full-read.h
+++ b/lib/full-read.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, read to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/full-write.c b/lib/full-write.c
index d119977e7..962602742 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/full-write.h b/lib/full-write.h
index 2637903ec..d20d2fe4a 100644
--- a/lib/full-write.h
+++ b/lib/full-write.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/getcwd.c b/lib/getcwd.c
index 9990b5072..d12b6c907 100644
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef	HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/getcwd.h b/lib/getcwd.h
index 9487ab97d..d69fe206b 100644
--- a/lib/getcwd.h
+++ b/lib/getcwd.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/getdate.h b/lib/getdate.h
index fc7fe38c4..dd97807a7 100644
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/getdate.y b/lib/getdate.y
index 52d15ea72..868f98303 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Originally written by Steven M. Bellovin <smb@research.att.com> while
    at the University of North Carolina at Chapel Hill.  Later tweaked by
diff --git a/lib/getgroups.c b/lib/getgroups.c
index 0f951b73b..084d1f828 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/gethostname.c b/lib/gethostname.c
index 3616810ff..f05ed85d5 100644
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* David MacKenzie <djm@gnu.ai.mit.edu> */
 
diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 6f7bc098c..a316314d8 100644
--- a/lib/gethrxtime.c
+++ b/lib/gethrxtime.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/gethrxtime.h b/lib/gethrxtime.h
index 2c0e36da7..4de3a9b3e 100644
--- a/lib/gethrxtime.h
+++ b/lib/gethrxtime.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/getline.c b/lib/getline.c
index 746d70887..5a7980ec9 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
diff --git a/lib/getline.h b/lib/getline.h
index ee9fc052c..b58e93f4f 100644
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GETLINE_H_
 # define GETLINE_H_ 1
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index b4b4e7517..6be6e3716 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Compile-time symbols that this file uses:
diff --git a/lib/getndelim2.c b/lib/getndelim2.c
index aef97807a..e9f8cb9c5 100644
--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
diff --git a/lib/getndelim2.h b/lib/getndelim2.h
index 39f80cb55..fb0a8c3e8 100644
--- a/lib/getndelim2.h
+++ b/lib/getndelim2.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GETNDELIM2_H
 #define GETNDELIM2_H 1
diff --git a/lib/getopt.c b/lib/getopt.c
index ef790b79e..bcb81c83f 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
diff --git a/lib/getopt1.c b/lib/getopt1.c
index a7472371f..5acd2245a 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/getopt_.h b/lib/getopt_.h
index 81612a5db..a4e78cb06 100644
--- a/lib/getopt_.h
+++ b/lib/getopt_.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GETOPT_H
 
diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index e5bc3f2fd..401579fd2 100644
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H	1
diff --git a/lib/getpagesize.h b/lib/getpagesize.h
index e63c1c708..17f070f63 100644
--- a/lib/getpagesize.h
+++ b/lib/getpagesize.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef HAVE_GETPAGESIZE
diff --git a/lib/getpass.c b/lib/getpass.c
index 4f520aef3..7367251e2 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/getpass.h b/lib/getpass.h
index dec2a36e3..bdff8754d 100644
--- a/lib/getpass.h
+++ b/lib/getpass.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GETPASS_H
 # define GETPASS_H
diff --git a/lib/gettext.h b/lib/gettext.h
index 67b12f83a..285cb314c 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
diff --git a/lib/gettime.c b/lib/gettime.c
index 929dece31..0f94297da 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 1ebe4d0ff..f9afc22c1 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/getugroups.c b/lib/getugroups.c
index dbd86ef93..599bf1cea 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie. */
 
diff --git a/lib/getusershell.c b/lib/getusershell.c
index 475f32619..1b9a18a3c 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
diff --git a/lib/group-member.c b/lib/group-member.c
index 9ba49a853..67fb9fd7c 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/group-member.h b/lib/group-member.h
index 967174509..30f85e9b3 100644
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef GROUP_MEMBER_H_
 # define GROUP_MEMBER_H_ 1
diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index cc2c9becf..b0566ec21 100644
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/hard-locale.h b/lib/hard-locale.h
index 010cb2768..c5cedc025 100644
--- a/lib/hard-locale.h
+++ b/lib/hard-locale.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef HARD_LOCALE_H_
 # define HARD_LOCALE_H_ 1
diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c
index 3328467e4..76b4db5c7 100644
--- a/lib/hash-pjw.c
+++ b/lib/hash-pjw.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/hash-pjw.h b/lib/hash-pjw.h
index 5847a2528..44b5440ac 100644
--- a/lib/hash-pjw.h
+++ b/lib/hash-pjw.h
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/hash.c b/lib/hash.c
index 374c22681..2b5d5c255 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* A generic hash table package.  */
 
diff --git a/lib/hash.h b/lib/hash.h
index 6920824e8..ab63a863f 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* A generic hash table package.  */
 
diff --git a/lib/human.c b/lib/human.c
index 1e8a59033..282a3236f 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert and Larry McVoy.  */
 
diff --git a/lib/human.h b/lib/human.h
index 728263406..3b23c123b 100644
--- a/lib/human.h
+++ b/lib/human.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert and Larry McVoy.  */
 
diff --git a/lib/idcache.c b/lib/idcache.c
index 8b85f07c3..87c85d809 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/intprops.h b/lib/intprops.h
index d36c182f4..65280b159 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/inttostr.c b/lib/inttostr.c
index 78a48af84..23748a137 100644
--- a/lib/inttostr.c
+++ b/lib/inttostr.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert */
 
diff --git a/lib/inttostr.h b/lib/inttostr.h
index 5f53681b5..952da97b6 100644
--- a/lib/inttostr.h
+++ b/lib/inttostr.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert */
 
diff --git a/lib/lchown.c b/lib/lchown.c
index b04fb3646..ff5679e7f 100644
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index c12cdbd4a..96d26bd9a 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Richard Stallman. */
 
diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 67d359984..16b4b5afd 100644
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if !defined LINEBUFFER_H
 # define LINEBUFFER_H
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 662f3ad33..10c69b067 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
diff --git a/lib/localcharset.h b/lib/localcharset.h
index 5058c8436..5030210d1 100644
--- a/lib/localcharset.h
+++ b/lib/localcharset.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff --git a/lib/long-options.c b/lib/long-options.c
index 77e849834..33f1d4627 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/long-options.h b/lib/long-options.h
index 50f0c34e1..03106a8de 100644
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/lstat.c b/lib/lstat.c
index d0ad496f3..ef274b09e 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define LSTAT
 #include "stat.c"
diff --git a/lib/makepath.c b/lib/makepath.c
index 5ae89d239..19ad1f4a8 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */
 
diff --git a/lib/makepath.h b/lib/makepath.h
index 67acef95c..1fd432cd8 100644
--- a/lib/makepath.h
+++ b/lib/makepath.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */
 
diff --git a/lib/malloc.c b/lib/malloc.c
index ca04c57cd..a75da9b79 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 4c79815e5..c9e78d650 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 4fcdb2096..1935e0a2d 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/md5.c b/lib/md5.c
index 999e25ef3..1646676f4 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
diff --git a/lib/md5.h b/lib/md5.h
index 661de4bba..59f95bce1 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -19,7 +19,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _MD5_H
 #define _MD5_H 1
diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 7cb427234..00519f51a 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/memcasecmp.h b/lib/memcasecmp.h
index ed99244c6..5c8b1f1f2 100644
--- a/lib/memcasecmp.h
+++ b/lib/memcasecmp.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/memchr.c b/lib/memchr.c
index eacb5c935..c4f24301c 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -22,7 +22,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/memcmp.c b/lib/memcmp.c
index 1d2947e66..ca68658f3 100644
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/memcoll.c b/lib/memcoll.c
index e777e6a5b..d9504b453 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
diff --git a/lib/memcoll.h b/lib/memcoll.h
index 66b2ecb1e..9b61ce939 100644
--- a/lib/memcoll.h
+++ b/lib/memcoll.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
diff --git a/lib/memcpy.c b/lib/memcpy.c
index fdca8de2c..09fb55d21 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
 
diff --git a/lib/mempcpy.c b/lib/mempcpy.c
index 3ac42af28..3502da244 100644
--- a/lib/mempcpy.c
+++ b/lib/mempcpy.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Specification.  */
 #include "mempcpy.h"
diff --git a/lib/mempcpy.h b/lib/mempcpy.h
index 4cc7a50c4..fa2032107 100644
--- a/lib/mempcpy.h
+++ b/lib/mempcpy.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef mempcpy
 
diff --git a/lib/memrchr.c b/lib/memrchr.c
index ae8dabcd0..0b6659fd9 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -21,7 +21,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/memrchr.h b/lib/memrchr.h
index 6a8e8153a..d4785c215 100644
--- a/lib/memrchr.h
+++ b/lib/memrchr.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_DECL_MEMRCHR
 # include <string.h>
diff --git a/lib/memset.c b/lib/memset.c
index d7321b200..890cbf12d 100644
--- a/lib/memset.c
+++ b/lib/memset.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/mkdir.c b/lib/mkdir.c
index c3ecc721e..807f322e5 100644
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/mkstemp.c b/lib/mkstemp.c
index f6312b646..ab635e6b4 100644
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
diff --git a/lib/mktime.c b/lib/mktime.c
index 916bdbd3e..fa65e01a0 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Define this to have a standalone program to test this implementation of
    mktime.  */
diff --git a/lib/modechange.c b/lib/modechange.c
index c7a2cb346..a2697f67f 100644
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@ai.mit.edu> */
 
diff --git a/lib/modechange.h b/lib/modechange.h
index a5a453438..a94b33d4d 100644
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Masks for the `flags' field in a `struct mode_change'. */
 
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 6d8ed2505..49dcf4247 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/mountlist.h b/lib/mountlist.h
index c90a87827..48d04341b 100644
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef MOUNTLIST_H_
 #define MOUNTLIST_H_
diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 6d849d7af..f41aed2cf 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/obstack.c b/lib/obstack.c
index 63396131c..f3ca2c2e0 100644
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/obstack.h b/lib/obstack.h
index 46a1cb781..940bc8051 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -19,7 +19,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Summary:
 
diff --git a/lib/openat.c b/lib/openat.c
index 14d138ced..fe539de16 100644
--- a/lib/openat.c
+++ b/lib/openat.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/openat.h b/lib/openat.h
index 2c9366343..d8db9cea5 100644
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/path-concat.c b/lib/path-concat.c
index 6e4092278..1643aa99a 100644
--- a/lib/path-concat.c
+++ b/lib/path-concat.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/path-concat.h b/lib/path-concat.h
index 94fc35726..7121796af 100644
--- a/lib/path-concat.h
+++ b/lib/path-concat.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/pathmax.h b/lib/pathmax.h
index bdd756e9c..48ba92a70 100644
--- a/lib/pathmax.h
+++ b/lib/pathmax.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PATHMAX_H
 # define _PATHMAX_H
diff --git a/lib/physmem.c b/lib/physmem.c
index dc67b575c..dabb00ccb 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/physmem.h b/lib/physmem.h
index 67f880c9a..931aede2a 100644
--- a/lib/physmem.h
+++ b/lib/physmem.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/posixtm.c b/lib/posixtm.c
index 402d59a1b..5273a71f4 100644
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Yacc-based version written by Jim Kingdon and David MacKenzie.
    Rewritten by Jim Meyering.  */
diff --git a/lib/posixtm.h b/lib/posixtm.h
index 4e9e8992d..252d268db 100644
--- a/lib/posixtm.h
+++ b/lib/posixtm.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Yacc-based version written by Jim Kingdon and David MacKenzie.
    Rewritten by Jim Meyering.  */
diff --git a/lib/posixver.c b/lib/posixver.c
index 754d7ac55..2fa097ae6 100644
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/printf-args.c b/lib/printf-args.c
index 926ae8ffe..0ed1acbb8 100644
--- a/lib/printf-args.c
+++ b/lib/printf-args.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/printf-args.h b/lib/printf-args.h
index 4b75c723f..cec1cc6c2 100644
--- a/lib/printf-args.h
+++ b/lib/printf-args.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index 4663a7269..0ecb86cd8 100644
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/printf-parse.h b/lib/printf-parse.h
index f3f458660..82a0d37cd 100644
--- a/lib/printf-parse.h
+++ b/lib/printf-parse.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
diff --git a/lib/putenv.c b/lib/putenv.c
index 1c097ccc4..69fb90be6 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/quote.c b/lib/quote.c
index 5f11d836b..4c75029a3 100644
--- a/lib/quote.c
+++ b/lib/quote.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
diff --git a/lib/quote.h b/lib/quote.h
index 682f9d1fd..5400eadb6 100644
--- a/lib/quote.h
+++ b/lib/quote.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
 char const *quote_n (int n, char const *name);
diff --git a/lib/quotearg.c b/lib/quotearg.c
index 8c95b7ae5..13fcf0b51 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
diff --git a/lib/quotearg.h b/lib/quotearg.h
index 14dc316d7..24f26f7d4 100644
--- a/lib/quotearg.h
+++ b/lib/quotearg.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
diff --git a/lib/raise.c b/lib/raise.c
index b04e3e3eb..8eeea5c89 100644
--- a/lib/raise.c
+++ b/lib/raise.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/readlink.c b/lib/readlink.c
index ad59c5355..bf8a5f783 100644
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/readtokens.c b/lib/readtokens.c
index 9fb611db1..c3525524f 100644
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering. */
 
diff --git a/lib/readtokens.h b/lib/readtokens.h
index 79582074a..45a0c4874 100644
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering. */
 
diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index b46ba8f85..494e08d55 100644
--- a/lib/readtokens0.c
+++ b/lib/readtokens0.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering. */
 
diff --git a/lib/readtokens0.h b/lib/readtokens0.h
index 75ba1f3c0..94c9a4914 100644
--- a/lib/readtokens0.h
+++ b/lib/readtokens0.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering. */
 
diff --git a/lib/readutmp.c b/lib/readutmp.c
index c3ce7f987..a6d91bd42 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by jla; revised by djm */
 
diff --git a/lib/readutmp.h b/lib/readutmp.h
index d04c94d2e..6cacc400e 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by jla; revised by djm */
 
diff --git a/lib/realloc.c b/lib/realloc.c
index 14fec075f..df570aa63 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/ref-add.sin b/lib/ref-add.sin
index 912c4af6d..bc5cc7976 100644
--- a/lib/ref-add.sin
+++ b/lib/ref-add.sin
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU General Public License along
 #   with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff --git a/lib/ref-del.sin b/lib/ref-del.sin
index 5cc1577d1..e9301bf2e 100644
--- a/lib/ref-del.sin
+++ b/lib/ref-del.sin
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU General Public License along
 #   with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
 #
diff --git a/lib/regex.c b/lib/regex.c
index 921378319..d715aa8ac 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* AIX requires this to be the first thing in the file. */
 #if defined _AIX && !defined REGEX_MALLOC
diff --git a/lib/regex.h b/lib/regex.h
index d4180c5f4..df46ce05a 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/lib/rename.c b/lib/rename.c
index 6ff070532..44cc1d292 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Volker Borchert */
 
diff --git a/lib/rmdir.c b/lib/rmdir.c
index ddb5c30b2..73d8e4339 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/root-dev-ino.c b/lib/root-dev-ino.c
index dc4614a84..9a1ef470a 100644
--- a/lib/root-dev-ino.c
+++ b/lib/root-dev-ino.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 7ed4ded90..3e3a38ecf 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/safe-read.c b/lib/safe-read.c
index 6f8bd780e..904fc71f0 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/safe-read.h b/lib/safe-read.h
index cbe6e0bfd..9f8a59bd4 100644
--- a/lib/safe-read.h
+++ b/lib/safe-read.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/safe-write.c b/lib/safe-write.c
index fbafa7cc6..4c375a6ca 100644
--- a/lib/safe-write.c
+++ b/lib/safe-write.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define SAFE_WRITE
 #include "safe-read.c"
diff --git a/lib/safe-write.h b/lib/safe-write.h
index ab1f45b4a..c19463620 100644
--- a/lib/safe-write.h
+++ b/lib/safe-write.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/same.c b/lib/same.c
index f018c62b6..ecbc58fdb 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/same.h b/lib/same.h
index 83c01b7e2..9fc057957 100644
--- a/lib/same.h
+++ b/lib/same.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef SAME_H_
 # define SAME_H_ 1
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 4dcf0d539..b3d09965d 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/save-cwd.h b/lib/save-cwd.h
index f1e5da3eb..d646b5540 100644
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/savedir.c b/lib/savedir.c
index c92e62ead..73cc374f4 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
diff --git a/lib/savedir.h b/lib/savedir.h
index bd3308521..4828b1bec 100644
--- a/lib/savedir.h
+++ b/lib/savedir.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
diff --git a/lib/setenv.c b/lib/setenv.c
index ae4174af2..33dbeb7a3 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/setenv.h b/lib/setenv.h
index 7ac5ae645..c89e7da4d 100644
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_SETENV || HAVE_UNSETENV
 
diff --git a/lib/settime.c b/lib/settime.c
index 4b9111a20..459d5436c 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/sha1.c b/lib/sha1.c
index 2bed14dbb..ff025af4a 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Scott G. Miller
    Credits:
diff --git a/lib/sha1.h b/lib/sha1.h
index fe470d401..b660cd0f3 100644
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef SHA1_H
 # define SHA1_H 1
diff --git a/lib/sig2str.c b/lib/sig2str.c
index 15d969c86..25ea5f310 100644
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/sig2str.h b/lib/sig2str.h
index bdc40f170..f0fe9c3a1 100644
--- a/lib/sig2str.h
+++ b/lib/sig2str.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/stat-macros.h b/lib/stat-macros.h
index facbabbc3..0957a22e6 100644
--- a/lib/stat-macros.h
+++ b/lib/stat-macros.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
diff --git a/lib/stat.c b/lib/stat.c
index df0be3a81..b06926ff0 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/stdbool_.h b/lib/stdbool_.h
index e33715a61..3177ae03c 100644
--- a/lib/stdbool_.h
+++ b/lib/stdbool_.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STDBOOL_H
 #define _STDBOOL_H
diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h
index 8a22f1220..0b9a9ab80 100644
--- a/lib/stdio-safer.h
+++ b/lib/stdio-safer.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index a01636cd1..acda21a26 100644
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c
index cf4ab88db..aa269c617 100644
--- a/lib/strcasecmp.c
+++ b/lib/strcasecmp.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strcspn.c b/lib/strcspn.c
index 33a662852..7f60620b3 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #if HAVE_CONFIG_H
diff --git a/lib/strdup.c b/lib/strdup.c
index 8c88e310a..d6d011620 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strdup.h b/lib/strdup.h
index d58bd13e2..a0d5fb929 100644
--- a/lib/strdup.h
+++ b/lib/strdup.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef STRDUP_H_
 #define STRDUP_H_
diff --git a/lib/strftime.c b/lib/strftime.c
index c50996efb..37c51232b 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strftime.h b/lib/strftime.h
index 3ff7ceab2..16b996e30 100644
--- a/lib/strftime.h
+++ b/lib/strftime.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <time.h>
 
diff --git a/lib/stripslash.c b/lib/stripslash.c
index 9998e641c..1a472f50a 100644
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strndup.c b/lib/strndup.c
index f85627e87..366a4eb57 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/strndup.h b/lib/strndup.h
index 318e79983..8eae493ad 100644
--- a/lib/strndup.h
+++ b/lib/strndup.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_STRNDUP
 
diff --git a/lib/strnlen.c b/lib/strnlen.c
index c9f389845..642c66fac 100644
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index ce4399620..9152440b1 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strstr.c b/lib/strstr.c
index dd4622297..8f82b4589 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
  * My personal strstr() implementation that beats most other algorithms.
diff --git a/lib/strtod.c b/lib/strtod.c
index 161f97a7b..79a82f29e 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index a1fd3b152..4724195ac 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert. */
 
diff --git a/lib/strtol.c b/lib/strtol.c
index 25e2e4d43..778898159 100644
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strtoll.c b/lib/strtoll.c
index ce6fd3f92..44f0970cf 100644
--- a/lib/strtoll.c
+++ b/lib/strtoll.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define QUAD	1
 
diff --git a/lib/strtoul.c b/lib/strtoul.c
index bb62f9b65..79ceed2f3 100644
--- a/lib/strtoul.c
+++ b/lib/strtoul.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define	UNSIGNED	1
 
diff --git a/lib/strtoull.c b/lib/strtoull.c
index d6aa1f805..6186bfb65 100644
--- a/lib/strtoull.c
+++ b/lib/strtoull.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define QUAD 1
 
diff --git a/lib/strverscmp.c b/lib/strverscmp.c
index 635360973..900c637dd 100644
--- a/lib/strverscmp.c
+++ b/lib/strverscmp.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strverscmp.h b/lib/strverscmp.h
index 717a057c1..7edeac5e4 100644
--- a/lib/strverscmp.h
+++ b/lib/strverscmp.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef STRVERSCMP_H_
 # define STRVERSCMP_H_
diff --git a/lib/tempname.c b/lib/tempname.c
index df46fc267..3de699b42 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/time_r.c b/lib/time_r.c
index 6c4250412..1298728ba 100644
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/time_r.h b/lib/time_r.h
index fbd3375e9..f8d5d5293 100644
--- a/lib/time_r.h
+++ b/lib/time_r.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/timespec.h b/lib/timespec.h
index d751fc6ab..1c7da7e7b 100644
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if ! defined TIMESPEC_H
 # define TIMESPEC_H
diff --git a/lib/tsearch.c b/lib/tsearch.c
index 82bb09474..e1d36cba3 100644
--- a/lib/tsearch.c
+++ b/lib/tsearch.c
@@ -14,8 +14,8 @@
 
    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.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
 
 /* Tree search for red/black trees.
    The algorithm for adding nodes is taken from one of the many "Algorithms"
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index b2085d599..83ed6d02f 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
diff --git a/lib/unicodeio.h b/lib/unicodeio.h
index 9e16a9039..31b69fad9 100644
--- a/lib/unicodeio.h
+++ b/lib/unicodeio.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef UNICODEIO_H
 # define UNICODEIO_H
diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h
index edaa7ca09..1b7a7601a 100644
--- a/lib/unistd-safer.h
+++ b/lib/unistd-safer.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h
index 3ff42f279..816ed3de5 100644
--- a/lib/unlocked-io.h
+++ b/lib/unlocked-io.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index 31c299e46..4b53fc9c8 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/userspec.c b/lib/userspec.c
index 33a9cfd1a..c3992d288 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
diff --git a/lib/utime.c b/lib/utime.c
index 05aa3467c..906cec8d7 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* derived from a function in touch.c */
 
diff --git a/lib/utimecmp.c b/lib/utimecmp.c
index edce9ef12..de1894412 100644
--- a/lib/utimecmp.c
+++ b/lib/utimecmp.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/utimecmp.h b/lib/utimecmp.h
index 8e5c4bc93..e82d15b80 100644
--- a/lib/utimecmp.h
+++ b/lib/utimecmp.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/utimens.c b/lib/utimens.c
index 4448f19f4..3f4d5e616 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index df939984a..16d6fbd29 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
    This must come before <config.h> because <config.h> may include
diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h
index 271210699..894008cae 100644
--- a/lib/vasnprintf.h
+++ b/lib/vasnprintf.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
diff --git a/lib/vasprintf.c b/lib/vasprintf.c
index 600e8aa3f..149c29242 100644
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/vasprintf.h b/lib/vasprintf.h
index fdd831f20..d02f15451 100644
--- a/lib/vasprintf.h
+++ b/lib/vasprintf.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _VASPRINTF_H
 #define _VASPRINTF_H
diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c
index 289ce458c..d5d6e2096 100644
--- a/lib/version-etc-fsf.c
+++ b/lib/version-etc-fsf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/version-etc.c b/lib/version-etc.c
index ac5844ce9..f7a68d4e3 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/version-etc.h b/lib/version-etc.h
index f1acb6587..84da53500 100644
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index ca3a689fa..637933e30 100644
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/xalloc.h b/lib/xalloc.h
index 8d0fcf0fa..f80977e30 100644
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef XALLOC_H_
 # define XALLOC_H_
diff --git a/lib/xfts.c b/lib/xfts.c
index e90ac6e35..b1e3aaa4b 100644
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 89d98847e..f8116f224 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/xgetcwd.h b/lib/xgetcwd.h
index 63138282e..70afe35e7 100644
--- a/lib/xgetcwd.h
+++ b/lib/xgetcwd.h
@@ -13,6 +13,6 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 extern char *xgetcwd (void);
diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 195a3750c..5b8b9b2e8 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 13c249026..c1632b96d 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 433d67f9c..063612e95 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c
index fe98165a5..08ad61002 100644
--- a/lib/xnanosleep.c
+++ b/lib/xnanosleep.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Mostly written (for sleep.c) by Paul Eggert.
    Factored out (creating this file) by Jim Meyering.  */
diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index 0f5e7d26f..0e260757c 100644
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
diff --git a/lib/xreadlink.h b/lib/xreadlink.h
index 5b2604bfe..9fcf836ae 100644
--- a/lib/xreadlink.h
+++ b/lib/xreadlink.h
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
diff --git a/lib/xstrndup.c b/lib/xstrndup.c
index 5addbf663..edf83cf87 100644
--- a/lib/xstrndup.c
+++ b/lib/xstrndup.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/xstrndup.h b/lib/xstrndup.h
index b09a2fc0b..88354cfd4 100644
--- a/lib/xstrndup.h
+++ b/lib/xstrndup.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <stddef.h>
 
diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index 4b5bcc9c5..06360dd3f 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/xstrtod.h b/lib/xstrtod.h
index f37acc917..3addb8c5f 100644
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 2cab528a0..b1bc36162 100644
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Cloned by Jim Meyering. */
 
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index af81eae9e..9940fc770 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 0d6b98482..119c683b1 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef XSTRTOL_H_
 # define XSTRTOL_H_ 1
diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c
index 8518ef077..d7cf2bed8 100644
--- a/lib/xstrtoumax.c
+++ b/lib/xstrtoumax.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert. */
 
diff --git a/lib/xtime.h b/lib/xtime.h
index 333f895b6..8da1f20f9 100644
--- a/lib/xtime.h
+++ b/lib/xtime.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/yesno.c b/lib/yesno.c
index 9a23c28fd..e4b945838 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/yesno.h b/lib/yesno.h
index 0c2570dd2..dfa70bcff 100644
--- a/lib/yesno.h
+++ b/lib/yesno.h
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef YESNO_H_
 # define YESNO_H_