e2fsprogs: fix Free Software Foundation address

Message ID 1523362173-21095-1-git-send-email-lczerner@redhat.com
State Accepted
Headers show
Series
  • e2fsprogs: fix Free Software Foundation address
Related show

Commit Message

Lukas Czerner April 10, 2018, 12:09 p.m.
This is mostly automatic replace of Free Software Foundation address in
all our files with the correct address that can be found at
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 NOTICE                                  | 8 ++++----
 aclocal.m4                              | 2 +-
 contrib/fallocate.c                     | 2 +-
 include/nonunix/getopt.h                | 4 ++--
 intl/Makefile.in                        | 2 +-
 intl/bindtextdom.c                      | 2 +-
 intl/config.charset                     | 2 +-
 intl/dcgettext.c                        | 2 +-
 intl/dcigettext.c                       | 2 +-
 intl/dcngettext.c                       | 2 +-
 intl/dgettext.c                         | 2 +-
 intl/dngettext.c                        | 2 +-
 intl/eval-plural.h                      | 2 +-
 intl/explodename.c                      | 2 +-
 intl/finddomain.c                       | 2 +-
 intl/gettext.c                          | 2 +-
 intl/gettextP.h                         | 2 +-
 intl/gmo.h                              | 2 +-
 intl/hash-string.h                      | 2 +-
 intl/intl-compat.c                      | 2 +-
 intl/l10nflist.c                        | 2 +-
 intl/libgettext.h                       | 2 +-
 intl/libgnuintl.h.in                    | 2 +-
 intl/loadinfo.h                         | 2 +-
 intl/loadmsgcat.c                       | 2 +-
 intl/localcharset.c                     | 2 +-
 intl/localcharset.h                     | 2 +-
 intl/locale.alias                       | 2 +-
 intl/localealias.c                      | 2 +-
 intl/localename.c                       | 2 +-
 intl/log.c                              | 2 +-
 intl/ngettext.c                         | 2 +-
 intl/os2compat.c                        | 2 +-
 intl/os2compat.h                        | 2 +-
 intl/osdep.c                            | 2 +-
 intl/plural-exp.c                       | 2 +-
 intl/plural-exp.h                       | 2 +-
 intl/plural.c                           | 6 +++---
 intl/plural.y                           | 2 +-
 intl/printf-args.c                      | 2 +-
 intl/printf-args.h                      | 2 +-
 intl/printf-parse.c                     | 2 +-
 intl/printf-parse.h                     | 2 +-
 intl/printf.c                           | 2 +-
 intl/ref-add.sin                        | 2 +-
 intl/ref-del.sin                        | 2 +-
 intl/relocatable.c                      | 2 +-
 intl/relocatable.h                      | 2 +-
 intl/textdomain.c                       | 2 +-
 intl/vasnprintf.c                       | 2 +-
 intl/vasnprintf.h                       | 2 +-
 intl/vasnwprintf.h                      | 2 +-
 intl/wprintf-parse.h                    | 2 +-
 intl/xsize.h                            | 2 +-
 lib/ext2fs/rbtree.c                     | 2 +-
 lib/ext2fs/rbtree.h                     | 2 +-
 lib/ext2fs/tdb.c                        | 2 +-
 lib/ext2fs/tdb.h                        | 2 +-
 lib/ext2fs/tdb/patches/replace-includes | 2 +-
 59 files changed, 65 insertions(+), 65 deletions(-)

Comments

Andreas Dilger April 10, 2018, 6:41 p.m. | #1
On Apr 10, 2018, at 6:09 AM, Lukas Czerner <lczerner@redhat.com> wrote:
> 
> This is mostly automatic replace of Free Software Foundation address in
> all our files with the correct address that can be found at
> http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

Why even provide the snail-mail address?  It makes more sense to just
provide the URL you gave above, which is what people can actually use.

Cheers, Andreas

> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> ---
> NOTICE                                  | 8 ++++----
> aclocal.m4                              | 2 +-
> contrib/fallocate.c                     | 2 +-
> include/nonunix/getopt.h                | 4 ++--
> intl/Makefile.in                        | 2 +-
> intl/bindtextdom.c                      | 2 +-
> intl/config.charset                     | 2 +-
> intl/dcgettext.c                        | 2 +-
> intl/dcigettext.c                       | 2 +-
> intl/dcngettext.c                       | 2 +-
> intl/dgettext.c                         | 2 +-
> intl/dngettext.c                        | 2 +-
> intl/eval-plural.h                      | 2 +-
> intl/explodename.c                      | 2 +-
> intl/finddomain.c                       | 2 +-
> intl/gettext.c                          | 2 +-
> intl/gettextP.h                         | 2 +-
> intl/gmo.h                              | 2 +-
> intl/hash-string.h                      | 2 +-
> intl/intl-compat.c                      | 2 +-
> intl/l10nflist.c                        | 2 +-
> intl/libgettext.h                       | 2 +-
> intl/libgnuintl.h.in                    | 2 +-
> intl/loadinfo.h                         | 2 +-
> intl/loadmsgcat.c                       | 2 +-
> intl/localcharset.c                     | 2 +-
> intl/localcharset.h                     | 2 +-
> intl/locale.alias                       | 2 +-
> intl/localealias.c                      | 2 +-
> intl/localename.c                       | 2 +-
> intl/log.c                              | 2 +-
> intl/ngettext.c                         | 2 +-
> intl/os2compat.c                        | 2 +-
> intl/os2compat.h                        | 2 +-
> intl/osdep.c                            | 2 +-
> intl/plural-exp.c                       | 2 +-
> intl/plural-exp.h                       | 2 +-
> intl/plural.c                           | 6 +++---
> intl/plural.y                           | 2 +-
> intl/printf-args.c                      | 2 +-
> intl/printf-args.h                      | 2 +-
> intl/printf-parse.c                     | 2 +-
> intl/printf-parse.h                     | 2 +-
> intl/printf.c                           | 2 +-
> intl/ref-add.sin                        | 2 +-
> intl/ref-del.sin                        | 2 +-
> intl/relocatable.c                      | 2 +-
> intl/relocatable.h                      | 2 +-
> intl/textdomain.c                       | 2 +-
> intl/vasnprintf.c                       | 2 +-
> intl/vasnprintf.h                       | 2 +-
> intl/vasnwprintf.h                      | 2 +-
> intl/wprintf-parse.h                    | 2 +-
> intl/xsize.h                            | 2 +-
> lib/ext2fs/rbtree.c                     | 2 +-
> lib/ext2fs/rbtree.h                     | 2 +-
> lib/ext2fs/tdb.c                        | 2 +-
> lib/ext2fs/tdb.h                        | 2 +-
> lib/ext2fs/tdb/patches/replace-includes | 2 +-
> 59 files changed, 65 insertions(+), 65 deletions(-)
> 
> diff --git a/NOTICE b/NOTICE
> index dd1227b..da98a3e 100644
> --- a/NOTICE
> +++ b/NOTICE
> @@ -27,7 +27,7 @@ package are flexible, if you give me enough lead time.
> 		       Version 2, June 1991
> 
>  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
> -     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
>  Everyone is permitted to copy and distribute verbatim copies
>  of this license document, but changing it is not allowed.
> 
> @@ -330,7 +330,7 @@ the "copyright" line and a pointer to where the full notice is found.
> 
>     You 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
> 
> 
> Also add information on how to contact you by electronic and paper mail.
> @@ -370,7 +370,7 @@ Public License instead of this License.
> 		       Version 2, June 1991
> 
>  Copyright (C) 1991 Free Software Foundation, Inc.
> -    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +    		    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
>  Everyone is permitted to copy and distribute verbatim copies
>  of this license document, but changing it is not allowed.
> 
> @@ -832,7 +832,7 @@ convey the exclusion of warranty; and each file should have at least the
> 
>     You should have received a copy of the GNU Library General Public
>     License along with this library; if not, write to the Free Software
> -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> 
> Also add information on how to contact you by electronic and paper mail.
> 
> diff --git a/aclocal.m4 b/aclocal.m4
> index cfb42cd..394e90d 100644
> --- a/aclocal.m4
> +++ b/aclocal.m4
> @@ -2874,7 +2874,7 @@ AC_DEFUN([AM_NLS],
> #
> # You 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.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> diff --git a/contrib/fallocate.c b/contrib/fallocate.c
> index a05b8f2..d4273d8 100644
> --- a/contrib/fallocate.c
> +++ b/contrib/fallocate.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
>  */
> 
> #ifndef _LARGEFILE_SOURCE
> diff --git a/include/nonunix/getopt.h b/include/nonunix/getopt.h
> index 33ad46c..88b62fd 100644
> --- a/include/nonunix/getopt.h
> +++ b/include/nonunix/getopt.h
> @@ -14,8 +14,8 @@
> 
>    You should have received a copy of the GNU Library General Public
>    License along with the GNU C Library; see the file COPYING.LIB.  If not,
> -   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> -   Boston, MA 02111-1307, USA.  */
> +   write to the Free Software Foundation, Inc., 51 Franklin Street,
> +   Fifth Floor, Boston, MA 02110-1301, USA. */
> 
> #ifndef _GETOPT_H
> #define _GETOPT_H 1
> diff --git a/intl/Makefile.in b/intl/Makefile.in
> index 66d7512..557bf40 100644
> --- a/intl/Makefile.in
> +++ b/intl/Makefile.in
> @@ -13,7 +13,7 @@
> #
> # You should have received a copy of the GNU Library 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.
> 
> PACKAGE = @PACKAGE@
> diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
> index 8284226..5b88d3a 100644
> --- a/intl/bindtextdom.c
> +++ b/intl/bindtextdom.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/config.charset b/intl/config.charset
> index 43d45fb..d4964dc 100644
> --- a/intl/config.charset
> +++ b/intl/config.charset
> @@ -15,7 +15,7 @@
> #
> #   You should have received a copy of the GNU Library 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.
> #
> # The table consists of lines of the form
> diff --git a/intl/dcgettext.c b/intl/dcgettext.c
> index 850acde..c2a63f0 100644
> --- a/intl/dcgettext.c
> +++ b/intl/dcgettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/dcigettext.c b/intl/dcigettext.c
> index f5a99b5..52bb16e 100644
> --- a/intl/dcigettext.c
> +++ b/intl/dcigettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> diff --git a/intl/dcngettext.c b/intl/dcngettext.c
> index 48a3e09..eb36833 100644
> --- a/intl/dcngettext.c
> +++ b/intl/dcngettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/dgettext.c b/intl/dgettext.c
> index b64b0f5..9b0d0de 100644
> --- a/intl/dgettext.c
> +++ b/intl/dgettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/dngettext.c b/intl/dngettext.c
> index 7815637..3278438 100644
> --- a/intl/dngettext.c
> +++ b/intl/dngettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/eval-plural.h b/intl/eval-plural.h
> index 01bd5af..dacd003 100644
> --- a/intl/eval-plural.h
> +++ b/intl/eval-plural.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 STATIC
> diff --git a/intl/explodename.c b/intl/explodename.c
> index 52c25e7..1361418 100644
> --- a/intl/explodename.c
> +++ b/intl/explodename.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/finddomain.c b/intl/finddomain.c
> index 4992a8c..498f858 100644
> --- a/intl/finddomain.c
> +++ b/intl/finddomain.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/gettext.c b/intl/gettext.c
> index 92c42fa..d82d439 100644
> --- a/intl/gettext.c
> +++ b/intl/gettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/gettextP.h b/intl/gettextP.h
> index 4d66c3d..ccd5e87 100644
> --- a/intl/gettextP.h
> +++ b/intl/gettextP.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _GETTEXTP_H
> diff --git a/intl/gmo.h b/intl/gmo.h
> index e7c9cc1..26515fe 100644
> --- a/intl/gmo.h
> +++ b/intl/gmo.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _GETTEXT_H
> diff --git a/intl/hash-string.h b/intl/hash-string.h
> index 093e3b1..2c9a3a5 100644
> --- a/intl/hash-string.h
> +++ b/intl/hash-string.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* @@ end of prolog @@ */
> diff --git a/intl/intl-compat.c b/intl/intl-compat.c
> index 96f9d95..15be09c 100644
> --- a/intl/intl-compat.c
> +++ b/intl/intl-compat.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/l10nflist.c b/intl/l10nflist.c
> index c13d36d..ac0d2d7 100644
> --- a/intl/l10nflist.c
> +++ b/intl/l10nflist.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Tell glibc's <string.h> to provide a prototype for stpcpy().
> diff --git a/intl/libgettext.h b/intl/libgettext.h
> index c069fbd..d03d82b 100644
> --- a/intl/libgettext.h
> +++ b/intl/libgettext.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.  */
> 
> /* Because on some systems (e.g. Solaris) we sometimes have to include
>    the systems libintl.h as well as this file we have more complex
> diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
> index 3be7eb9..c8c5620 100644
> --- a/intl/libgnuintl.h.in
> +++ b/intl/libgnuintl.h.in
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _LIBINTL_H
> diff --git a/intl/loadinfo.h b/intl/loadinfo.h
> index 65e5ebd..d6408f2 100644
> --- a/intl/loadinfo.h
> +++ b/intl/loadinfo.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _LOADINFO_H
> diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
> index 7fab71a..fc3689f 100644
> --- a/intl/loadmsgcat.c
> +++ b/intl/loadmsgcat.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> diff --git a/intl/localcharset.c b/intl/localcharset.c
> index a3e3a9b..f9f411e 100644
> --- a/intl/localcharset.c
> +++ b/intl/localcharset.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Written by Bruno Haible <bruno@clisp.org>.  */
> diff --git a/intl/localcharset.h b/intl/localcharset.h
> index 3b137e7..129e4a4 100644
> --- a/intl/localcharset.h
> +++ b/intl/localcharset.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _LOCALCHARSET_H
> diff --git a/intl/locale.alias b/intl/locale.alias
> index bd6bb25..faa6969 100644
> --- a/intl/locale.alias
> +++ b/intl/locale.alias
> @@ -13,7 +13,7 @@
> #
> # You should have received a copy of the GNU Library 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.
> 
> # The format of this file is the same as for the corresponding file of
> diff --git a/intl/localealias.c b/intl/localealias.c
> index 2eaf881..7a092a0 100644
> --- a/intl/localealias.c
> +++ b/intl/localealias.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> diff --git a/intl/localename.c b/intl/localename.c
> index 5662e54..9d65146 100644
> --- a/intl/localename.c
> +++ b/intl/localename.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
> diff --git a/intl/log.c b/intl/log.c
> index cb6076e..89f82df 100644
> --- a/intl/log.c
> +++ b/intl/log.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Written by Bruno Haible <bruno@clisp.org>.  */
> diff --git a/intl/ngettext.c b/intl/ngettext.c
> index e73e00c..a33529c 100644
> --- a/intl/ngettext.c
> +++ b/intl/ngettext.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/os2compat.c b/intl/os2compat.c
> index c8dc33e..d041de2 100644
> --- a/intl/os2compat.c
> +++ b/intl/os2compat.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> #define OS2_AWARE
> diff --git a/intl/os2compat.h b/intl/os2compat.h
> index 4f74e8c..a18d582 100644
> --- a/intl/os2compat.h
> +++ b/intl/os2compat.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* When included from os2compat.h we need all the original definitions */
> diff --git a/intl/osdep.c b/intl/osdep.c
> index b372598..d2d8575 100644
> --- a/intl/osdep.c
> +++ b/intl/osdep.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 defined __EMX__
> diff --git a/intl/plural-exp.c b/intl/plural-exp.c
> index 8c04e64..1873be9 100644
> --- a/intl/plural-exp.c
> +++ b/intl/plural-exp.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/plural-exp.h b/intl/plural-exp.h
> index 49e2c5b..f540184 100644
> --- a/intl/plural-exp.h
> +++ b/intl/plural-exp.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _PLURAL_EXP_H
> diff --git a/intl/plural.c b/intl/plural.c
> index 535305b..2219398 100644
> --- a/intl/plural.c
> +++ b/intl/plural.c
> @@ -34,7 +34,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* The bison generated parser uses alloca.  AIX 3 forces us to put this
> @@ -315,8 +315,8 @@ static const short yycheck[] =
> 
>    You 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.  */
> 
> /* As a special exception, when this file is copied by Bison into a
>    Bison output file, you may use that output file without restriction.
> diff --git a/intl/plural.y b/intl/plural.y
> index 4d33bd7..fe79112 100644
> --- a/intl/plural.y
> +++ b/intl/plural.y
> @@ -15,7 +15,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* The bison generated parser uses alloca.  AIX 3 forces us to put this
> diff --git a/intl/printf-args.c b/intl/printf-args.c
> index f6f3219..f975901 100644
> --- a/intl/printf-args.c
> +++ b/intl/printf-args.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/printf-args.h b/intl/printf-args.h
> index f11e64c..625b803 100644
> --- a/intl/printf-args.h
> +++ b/intl/printf-args.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _PRINTF_ARGS_H
> diff --git a/intl/printf-parse.c b/intl/printf-parse.c
> index 416deda..5550a53 100644
> --- a/intl/printf-parse.c
> +++ b/intl/printf-parse.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/printf-parse.h b/intl/printf-parse.h
> index 8aec50e..e785338 100644
> --- a/intl/printf-parse.h
> +++ b/intl/printf-parse.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _PRINTF_PARSE_H
> diff --git a/intl/printf.c b/intl/printf.c
> index 878646c..5e112b6 100644
> --- a/intl/printf.c
> +++ b/intl/printf.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/ref-add.sin b/intl/ref-add.sin
> index 167374e..3678c28 100644
> --- a/intl/ref-add.sin
> +++ b/intl/ref-add.sin
> @@ -14,7 +14,7 @@
> #
> #   You should have received a copy of the GNU Library 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.
> #
> # Written by Bruno Haible <haible@clisp.cons.org>.
> diff --git a/intl/ref-del.sin b/intl/ref-del.sin
> index 613cf37..0c12d8e 100644
> --- a/intl/ref-del.sin
> +++ b/intl/ref-del.sin
> @@ -14,7 +14,7 @@
> #
> #   You should have received a copy of the GNU Library 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.
> #
> # Written by Bruno Haible <haible@clisp.cons.org>.
> diff --git a/intl/relocatable.c b/intl/relocatable.c
> index bf7c708..a2e5aa7 100644
> --- a/intl/relocatable.c
> +++ b/intl/relocatable.c
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> 
> diff --git a/intl/relocatable.h b/intl/relocatable.h
> index 48c5b71..614e64e 100644
> --- a/intl/relocatable.h
> +++ b/intl/relocatable.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _RELOCATABLE_H
> diff --git a/intl/textdomain.c b/intl/textdomain.c
> index 8745a84..2bf6240 100644
> --- a/intl/textdomain.c
> +++ b/intl/textdomain.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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/intl/vasnprintf.c b/intl/vasnprintf.c
> index 61bfb9e..76658d7 100644
> --- a/intl/vasnprintf.c
> +++ b/intl/vasnprintf.c
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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.  */
> 
> /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
> diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
> index 65f1bc1..5c62fb2 100644
> --- a/intl/vasnprintf.h
> +++ b/intl/vasnprintf.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _VASNPRINTF_H
> diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
> index d3cef4c..6ff03ce 100644
> --- a/intl/vasnwprintf.h
> +++ b/intl/vasnwprintf.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _VASNWPRINTF_H
> diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
> index 24a2cfc..600b89a 100644
> --- a/intl/wprintf-parse.h
> +++ b/intl/wprintf-parse.h
> @@ -13,7 +13,7 @@
> 
>    You should have received a copy of the GNU Library 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 _WPRINTF_PARSE_H
> diff --git a/intl/xsize.h b/intl/xsize.h
> index e3707fa..b8925dc 100644
> --- a/intl/xsize.h
> +++ b/intl/xsize.h
> @@ -14,7 +14,7 @@
> 
>    You should have received a copy of the GNU Library 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 _XSIZE_H
> diff --git a/lib/ext2fs/rbtree.c b/lib/ext2fs/rbtree.c
> index 9439303..5b92099 100644
> --- a/lib/ext2fs/rbtree.c
> +++ b/lib/ext2fs/rbtree.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
> +  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> 
>   linux/lib/rbtree.c
> */
> diff --git a/lib/ext2fs/rbtree.h b/lib/ext2fs/rbtree.h
> index 1973b82..9e80677 100644
> --- a/lib/ext2fs/rbtree.h
> +++ b/lib/ext2fs/rbtree.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
> +  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> 
>   linux/include/linux/rbtree.h
> 
> diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
> index 9c1dd31..195a4c0 100644
> --- a/lib/ext2fs/tdb.c
> +++ b/lib/ext2fs/tdb.c
> @@ -26,7 +26,7 @@ Last Changed Date: 2007-06-22 13:36:10 -0400 (Fri, 22 Jun 2007)
> 
>    You should have received a copy of the GNU Lesser General Public
>    License along with this library; if not, write to the Free Software
> -   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> */
> 
> #ifdef CONFIG_STAND_ALONE
> diff --git a/lib/ext2fs/tdb.h b/lib/ext2fs/tdb.h
> index 6a4086c..de7aa33 100644
> --- a/lib/ext2fs/tdb.h
> +++ b/lib/ext2fs/tdb.h
> @@ -24,7 +24,7 @@
> 
>    You should have received a copy of the GNU Lesser General Public
>    License along with this library; if not, write to the Free Software
> -   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> */
> 
> #ifdef  __cplusplus
> diff --git a/lib/ext2fs/tdb/patches/replace-includes b/lib/ext2fs/tdb/patches/replace-includes
> index b1d0d57..f4181c1 100644
> --- a/lib/ext2fs/tdb/patches/replace-includes
> +++ b/lib/ext2fs/tdb/patches/replace-includes
> @@ -3,7 +3,7 @@ Index: tdb/tdb.c
> --- tdb.orig/tdb.c
> +++ tdb/tdb.c
> @@ -29,11 +29,82 @@ Last Changed Date: 2007-06-22 13:36:10 -
> -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
>  */
> 
> -#include "replace.h"
> --
> 2.7.5
> 


Cheers, Andreas
Lukas Czerner April 11, 2018, 7:21 a.m. | #2
On Tue, Apr 10, 2018 at 12:41:46PM -0600, Andreas Dilger wrote:
> On Apr 10, 2018, at 6:09 AM, Lukas Czerner <lczerner@redhat.com> wrote:
> > 
> > This is mostly automatic replace of Free Software Foundation address in
> > all our files with the correct address that can be found at
> > http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> 
> Why even provide the snail-mail address?  It makes more sense to just
> provide the URL you gave above, which is what people can actually use.

Since it's the licence we're talking about I didn't want to make any
unnecessary changes since I am not really sure what's allowed and what
is not. So I just fixed what was wrong and that's the snail-mail
address.

If you want to remove the licence text and replace it with the link,
then I'd like to see a solid confirmation that it is ok to do so.
Otherwise personally I do not really mind either way.

-Lukas

> 
> Cheers, Andreas
> 
> > 
> > Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> > ---
> > NOTICE                                  | 8 ++++----
> > aclocal.m4                              | 2 +-
> > contrib/fallocate.c                     | 2 +-
> > include/nonunix/getopt.h                | 4 ++--
> > intl/Makefile.in                        | 2 +-
> > intl/bindtextdom.c                      | 2 +-
> > intl/config.charset                     | 2 +-
> > intl/dcgettext.c                        | 2 +-
> > intl/dcigettext.c                       | 2 +-
> > intl/dcngettext.c                       | 2 +-
> > intl/dgettext.c                         | 2 +-
> > intl/dngettext.c                        | 2 +-
> > intl/eval-plural.h                      | 2 +-
> > intl/explodename.c                      | 2 +-
> > intl/finddomain.c                       | 2 +-
> > intl/gettext.c                          | 2 +-
> > intl/gettextP.h                         | 2 +-
> > intl/gmo.h                              | 2 +-
> > intl/hash-string.h                      | 2 +-
> > intl/intl-compat.c                      | 2 +-
> > intl/l10nflist.c                        | 2 +-
> > intl/libgettext.h                       | 2 +-
> > intl/libgnuintl.h.in                    | 2 +-
> > intl/loadinfo.h                         | 2 +-
> > intl/loadmsgcat.c                       | 2 +-
> > intl/localcharset.c                     | 2 +-
> > intl/localcharset.h                     | 2 +-
> > intl/locale.alias                       | 2 +-
> > intl/localealias.c                      | 2 +-
> > intl/localename.c                       | 2 +-
> > intl/log.c                              | 2 +-
> > intl/ngettext.c                         | 2 +-
> > intl/os2compat.c                        | 2 +-
> > intl/os2compat.h                        | 2 +-
> > intl/osdep.c                            | 2 +-
> > intl/plural-exp.c                       | 2 +-
> > intl/plural-exp.h                       | 2 +-
> > intl/plural.c                           | 6 +++---
> > intl/plural.y                           | 2 +-
> > intl/printf-args.c                      | 2 +-
> > intl/printf-args.h                      | 2 +-
> > intl/printf-parse.c                     | 2 +-
> > intl/printf-parse.h                     | 2 +-
> > intl/printf.c                           | 2 +-
> > intl/ref-add.sin                        | 2 +-
> > intl/ref-del.sin                        | 2 +-
> > intl/relocatable.c                      | 2 +-
> > intl/relocatable.h                      | 2 +-
> > intl/textdomain.c                       | 2 +-
> > intl/vasnprintf.c                       | 2 +-
> > intl/vasnprintf.h                       | 2 +-
> > intl/vasnwprintf.h                      | 2 +-
> > intl/wprintf-parse.h                    | 2 +-
> > intl/xsize.h                            | 2 +-
> > lib/ext2fs/rbtree.c                     | 2 +-
> > lib/ext2fs/rbtree.h                     | 2 +-
> > lib/ext2fs/tdb.c                        | 2 +-
> > lib/ext2fs/tdb.h                        | 2 +-
> > lib/ext2fs/tdb/patches/replace-includes | 2 +-
> > 59 files changed, 65 insertions(+), 65 deletions(-)
> > 
> > diff --git a/NOTICE b/NOTICE
> > index dd1227b..da98a3e 100644
> > --- a/NOTICE
> > +++ b/NOTICE
> > @@ -27,7 +27,7 @@ package are flexible, if you give me enough lead time.
> > 		       Version 2, June 1991
> > 
> >  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
> > -     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> >  Everyone is permitted to copy and distribute verbatim copies
> >  of this license document, but changing it is not allowed.
> > 
> > @@ -330,7 +330,7 @@ the "copyright" line and a pointer to where the full notice is found.
> > 
> >     You 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
> > 
> > 
> > Also add information on how to contact you by electronic and paper mail.
> > @@ -370,7 +370,7 @@ Public License instead of this License.
> > 		       Version 2, June 1991
> > 
> >  Copyright (C) 1991 Free Software Foundation, Inc.
> > -    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +    		    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> >  Everyone is permitted to copy and distribute verbatim copies
> >  of this license document, but changing it is not allowed.
> > 
> > @@ -832,7 +832,7 @@ convey the exclusion of warranty; and each file should have at least the
> > 
> >     You should have received a copy of the GNU Library General Public
> >     License along with this library; if not, write to the Free Software
> > -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> > 
> > Also add information on how to contact you by electronic and paper mail.
> > 
> > diff --git a/aclocal.m4 b/aclocal.m4
> > index cfb42cd..394e90d 100644
> > --- a/aclocal.m4
> > +++ b/aclocal.m4
> > @@ -2874,7 +2874,7 @@ AC_DEFUN([AM_NLS],
> > #
> > # You 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.
> > #
> > # As a special exception to the GNU General Public License, if you
> > # distribute this file as part of a program that contains a
> > diff --git a/contrib/fallocate.c b/contrib/fallocate.c
> > index a05b8f2..d4273d8 100644
> > --- a/contrib/fallocate.c
> > +++ b/contrib/fallocate.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
> >  */
> > 
> > #ifndef _LARGEFILE_SOURCE
> > diff --git a/include/nonunix/getopt.h b/include/nonunix/getopt.h
> > index 33ad46c..88b62fd 100644
> > --- a/include/nonunix/getopt.h
> > +++ b/include/nonunix/getopt.h
> > @@ -14,8 +14,8 @@
> > 
> >    You should have received a copy of the GNU Library General Public
> >    License along with the GNU C Library; see the file COPYING.LIB.  If not,
> > -   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> > -   Boston, MA 02111-1307, USA.  */
> > +   write to the Free Software Foundation, Inc., 51 Franklin Street,
> > +   Fifth Floor, Boston, MA 02110-1301, USA. */
> > 
> > #ifndef _GETOPT_H
> > #define _GETOPT_H 1
> > diff --git a/intl/Makefile.in b/intl/Makefile.in
> > index 66d7512..557bf40 100644
> > --- a/intl/Makefile.in
> > +++ b/intl/Makefile.in
> > @@ -13,7 +13,7 @@
> > #
> > # You should have received a copy of the GNU Library 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.
> > 
> > PACKAGE = @PACKAGE@
> > diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
> > index 8284226..5b88d3a 100644
> > --- a/intl/bindtextdom.c
> > +++ b/intl/bindtextdom.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/config.charset b/intl/config.charset
> > index 43d45fb..d4964dc 100644
> > --- a/intl/config.charset
> > +++ b/intl/config.charset
> > @@ -15,7 +15,7 @@
> > #
> > #   You should have received a copy of the GNU Library 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.
> > #
> > # The table consists of lines of the form
> > diff --git a/intl/dcgettext.c b/intl/dcgettext.c
> > index 850acde..c2a63f0 100644
> > --- a/intl/dcgettext.c
> > +++ b/intl/dcgettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/dcigettext.c b/intl/dcigettext.c
> > index f5a99b5..52bb16e 100644
> > --- a/intl/dcigettext.c
> > +++ b/intl/dcigettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> > diff --git a/intl/dcngettext.c b/intl/dcngettext.c
> > index 48a3e09..eb36833 100644
> > --- a/intl/dcngettext.c
> > +++ b/intl/dcngettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/dgettext.c b/intl/dgettext.c
> > index b64b0f5..9b0d0de 100644
> > --- a/intl/dgettext.c
> > +++ b/intl/dgettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/dngettext.c b/intl/dngettext.c
> > index 7815637..3278438 100644
> > --- a/intl/dngettext.c
> > +++ b/intl/dngettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/eval-plural.h b/intl/eval-plural.h
> > index 01bd5af..dacd003 100644
> > --- a/intl/eval-plural.h
> > +++ b/intl/eval-plural.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 STATIC
> > diff --git a/intl/explodename.c b/intl/explodename.c
> > index 52c25e7..1361418 100644
> > --- a/intl/explodename.c
> > +++ b/intl/explodename.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/finddomain.c b/intl/finddomain.c
> > index 4992a8c..498f858 100644
> > --- a/intl/finddomain.c
> > +++ b/intl/finddomain.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/gettext.c b/intl/gettext.c
> > index 92c42fa..d82d439 100644
> > --- a/intl/gettext.c
> > +++ b/intl/gettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/gettextP.h b/intl/gettextP.h
> > index 4d66c3d..ccd5e87 100644
> > --- a/intl/gettextP.h
> > +++ b/intl/gettextP.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _GETTEXTP_H
> > diff --git a/intl/gmo.h b/intl/gmo.h
> > index e7c9cc1..26515fe 100644
> > --- a/intl/gmo.h
> > +++ b/intl/gmo.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _GETTEXT_H
> > diff --git a/intl/hash-string.h b/intl/hash-string.h
> > index 093e3b1..2c9a3a5 100644
> > --- a/intl/hash-string.h
> > +++ b/intl/hash-string.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* @@ end of prolog @@ */
> > diff --git a/intl/intl-compat.c b/intl/intl-compat.c
> > index 96f9d95..15be09c 100644
> > --- a/intl/intl-compat.c
> > +++ b/intl/intl-compat.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/l10nflist.c b/intl/l10nflist.c
> > index c13d36d..ac0d2d7 100644
> > --- a/intl/l10nflist.c
> > +++ b/intl/l10nflist.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Tell glibc's <string.h> to provide a prototype for stpcpy().
> > diff --git a/intl/libgettext.h b/intl/libgettext.h
> > index c069fbd..d03d82b 100644
> > --- a/intl/libgettext.h
> > +++ b/intl/libgettext.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.  */
> > 
> > /* Because on some systems (e.g. Solaris) we sometimes have to include
> >    the systems libintl.h as well as this file we have more complex
> > diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
> > index 3be7eb9..c8c5620 100644
> > --- a/intl/libgnuintl.h.in
> > +++ b/intl/libgnuintl.h.in
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _LIBINTL_H
> > diff --git a/intl/loadinfo.h b/intl/loadinfo.h
> > index 65e5ebd..d6408f2 100644
> > --- a/intl/loadinfo.h
> > +++ b/intl/loadinfo.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _LOADINFO_H
> > diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
> > index 7fab71a..fc3689f 100644
> > --- a/intl/loadmsgcat.c
> > +++ b/intl/loadmsgcat.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> > diff --git a/intl/localcharset.c b/intl/localcharset.c
> > index a3e3a9b..f9f411e 100644
> > --- a/intl/localcharset.c
> > +++ b/intl/localcharset.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Written by Bruno Haible <bruno@clisp.org>.  */
> > diff --git a/intl/localcharset.h b/intl/localcharset.h
> > index 3b137e7..129e4a4 100644
> > --- a/intl/localcharset.h
> > +++ b/intl/localcharset.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _LOCALCHARSET_H
> > diff --git a/intl/locale.alias b/intl/locale.alias
> > index bd6bb25..faa6969 100644
> > --- a/intl/locale.alias
> > +++ b/intl/locale.alias
> > @@ -13,7 +13,7 @@
> > #
> > # You should have received a copy of the GNU Library 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.
> > 
> > # The format of this file is the same as for the corresponding file of
> > diff --git a/intl/localealias.c b/intl/localealias.c
> > index 2eaf881..7a092a0 100644
> > --- a/intl/localealias.c
> > +++ b/intl/localealias.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Tell glibc's <string.h> to provide a prototype for mempcpy().
> > diff --git a/intl/localename.c b/intl/localename.c
> > index 5662e54..9d65146 100644
> > --- a/intl/localename.c
> > +++ b/intl/localename.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
> > diff --git a/intl/log.c b/intl/log.c
> > index cb6076e..89f82df 100644
> > --- a/intl/log.c
> > +++ b/intl/log.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Written by Bruno Haible <bruno@clisp.org>.  */
> > diff --git a/intl/ngettext.c b/intl/ngettext.c
> > index e73e00c..a33529c 100644
> > --- a/intl/ngettext.c
> > +++ b/intl/ngettext.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/os2compat.c b/intl/os2compat.c
> > index c8dc33e..d041de2 100644
> > --- a/intl/os2compat.c
> > +++ b/intl/os2compat.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > #define OS2_AWARE
> > diff --git a/intl/os2compat.h b/intl/os2compat.h
> > index 4f74e8c..a18d582 100644
> > --- a/intl/os2compat.h
> > +++ b/intl/os2compat.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* When included from os2compat.h we need all the original definitions */
> > diff --git a/intl/osdep.c b/intl/osdep.c
> > index b372598..d2d8575 100644
> > --- a/intl/osdep.c
> > +++ b/intl/osdep.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 defined __EMX__
> > diff --git a/intl/plural-exp.c b/intl/plural-exp.c
> > index 8c04e64..1873be9 100644
> > --- a/intl/plural-exp.c
> > +++ b/intl/plural-exp.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/plural-exp.h b/intl/plural-exp.h
> > index 49e2c5b..f540184 100644
> > --- a/intl/plural-exp.h
> > +++ b/intl/plural-exp.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _PLURAL_EXP_H
> > diff --git a/intl/plural.c b/intl/plural.c
> > index 535305b..2219398 100644
> > --- a/intl/plural.c
> > +++ b/intl/plural.c
> > @@ -34,7 +34,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* The bison generated parser uses alloca.  AIX 3 forces us to put this
> > @@ -315,8 +315,8 @@ static const short yycheck[] =
> > 
> >    You 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.  */
> > 
> > /* As a special exception, when this file is copied by Bison into a
> >    Bison output file, you may use that output file without restriction.
> > diff --git a/intl/plural.y b/intl/plural.y
> > index 4d33bd7..fe79112 100644
> > --- a/intl/plural.y
> > +++ b/intl/plural.y
> > @@ -15,7 +15,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* The bison generated parser uses alloca.  AIX 3 forces us to put this
> > diff --git a/intl/printf-args.c b/intl/printf-args.c
> > index f6f3219..f975901 100644
> > --- a/intl/printf-args.c
> > +++ b/intl/printf-args.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/printf-args.h b/intl/printf-args.h
> > index f11e64c..625b803 100644
> > --- a/intl/printf-args.h
> > +++ b/intl/printf-args.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _PRINTF_ARGS_H
> > diff --git a/intl/printf-parse.c b/intl/printf-parse.c
> > index 416deda..5550a53 100644
> > --- a/intl/printf-parse.c
> > +++ b/intl/printf-parse.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/printf-parse.h b/intl/printf-parse.h
> > index 8aec50e..e785338 100644
> > --- a/intl/printf-parse.h
> > +++ b/intl/printf-parse.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _PRINTF_PARSE_H
> > diff --git a/intl/printf.c b/intl/printf.c
> > index 878646c..5e112b6 100644
> > --- a/intl/printf.c
> > +++ b/intl/printf.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/ref-add.sin b/intl/ref-add.sin
> > index 167374e..3678c28 100644
> > --- a/intl/ref-add.sin
> > +++ b/intl/ref-add.sin
> > @@ -14,7 +14,7 @@
> > #
> > #   You should have received a copy of the GNU Library 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.
> > #
> > # Written by Bruno Haible <haible@clisp.cons.org>.
> > diff --git a/intl/ref-del.sin b/intl/ref-del.sin
> > index 613cf37..0c12d8e 100644
> > --- a/intl/ref-del.sin
> > +++ b/intl/ref-del.sin
> > @@ -14,7 +14,7 @@
> > #
> > #   You should have received a copy of the GNU Library 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.
> > #
> > # Written by Bruno Haible <haible@clisp.cons.org>.
> > diff --git a/intl/relocatable.c b/intl/relocatable.c
> > index bf7c708..a2e5aa7 100644
> > --- a/intl/relocatable.c
> > +++ b/intl/relocatable.c
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > 
> > diff --git a/intl/relocatable.h b/intl/relocatable.h
> > index 48c5b71..614e64e 100644
> > --- a/intl/relocatable.h
> > +++ b/intl/relocatable.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _RELOCATABLE_H
> > diff --git a/intl/textdomain.c b/intl/textdomain.c
> > index 8745a84..2bf6240 100644
> > --- a/intl/textdomain.c
> > +++ b/intl/textdomain.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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/intl/vasnprintf.c b/intl/vasnprintf.c
> > index 61bfb9e..76658d7 100644
> > --- a/intl/vasnprintf.c
> > +++ b/intl/vasnprintf.c
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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.  */
> > 
> > /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
> > diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
> > index 65f1bc1..5c62fb2 100644
> > --- a/intl/vasnprintf.h
> > +++ b/intl/vasnprintf.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _VASNPRINTF_H
> > diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
> > index d3cef4c..6ff03ce 100644
> > --- a/intl/vasnwprintf.h
> > +++ b/intl/vasnwprintf.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _VASNWPRINTF_H
> > diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
> > index 24a2cfc..600b89a 100644
> > --- a/intl/wprintf-parse.h
> > +++ b/intl/wprintf-parse.h
> > @@ -13,7 +13,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _WPRINTF_PARSE_H
> > diff --git a/intl/xsize.h b/intl/xsize.h
> > index e3707fa..b8925dc 100644
> > --- a/intl/xsize.h
> > +++ b/intl/xsize.h
> > @@ -14,7 +14,7 @@
> > 
> >    You should have received a copy of the GNU Library 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 _XSIZE_H
> > diff --git a/lib/ext2fs/rbtree.c b/lib/ext2fs/rbtree.c
> > index 9439303..5b92099 100644
> > --- a/lib/ext2fs/rbtree.c
> > +++ b/lib/ext2fs/rbtree.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
> > +  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> > 
> >   linux/lib/rbtree.c
> > */
> > diff --git a/lib/ext2fs/rbtree.h b/lib/ext2fs/rbtree.h
> > index 1973b82..9e80677 100644
> > --- a/lib/ext2fs/rbtree.h
> > +++ b/lib/ext2fs/rbtree.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
> > +  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> > 
> >   linux/include/linux/rbtree.h
> > 
> > diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
> > index 9c1dd31..195a4c0 100644
> > --- a/lib/ext2fs/tdb.c
> > +++ b/lib/ext2fs/tdb.c
> > @@ -26,7 +26,7 @@ Last Changed Date: 2007-06-22 13:36:10 -0400 (Fri, 22 Jun 2007)
> > 
> >    You should have received a copy of the GNU Lesser General Public
> >    License along with this library; if not, write to the Free Software
> > -   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> > */
> > 
> > #ifdef CONFIG_STAND_ALONE
> > diff --git a/lib/ext2fs/tdb.h b/lib/ext2fs/tdb.h
> > index 6a4086c..de7aa33 100644
> > --- a/lib/ext2fs/tdb.h
> > +++ b/lib/ext2fs/tdb.h
> > @@ -24,7 +24,7 @@
> > 
> >    You should have received a copy of the GNU Lesser General Public
> >    License along with this library; if not, write to the Free Software
> > -   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> > */
> > 
> > #ifdef  __cplusplus
> > diff --git a/lib/ext2fs/tdb/patches/replace-includes b/lib/ext2fs/tdb/patches/replace-includes
> > index b1d0d57..f4181c1 100644
> > --- a/lib/ext2fs/tdb/patches/replace-includes
> > +++ b/lib/ext2fs/tdb/patches/replace-includes
> > @@ -3,7 +3,7 @@ Index: tdb/tdb.c
> > --- tdb.orig/tdb.c
> > +++ tdb/tdb.c
> > @@ -29,11 +29,82 @@ Last Changed Date: 2007-06-22 13:36:10 -
> > -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> > +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
> >  */
> > 
> > -#include "replace.h"
> > --
> > 2.7.5
> > 
> 
> 
> Cheers, Andreas
> 
> 
> 
> 
>
Theodore Y. Ts'o April 19, 2018, 3:40 p.m. | #3
On Tue, Apr 10, 2018 at 02:09:33PM +0200, Lukas Czerner wrote:
> This is mostly automatic replace of Free Software Foundation address in
> all our files with the correct address that can be found at
> http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Applied, thanks.

At some point we might want to go to using SPDX tags, but that's for a
later project.

					- Ted

Patch

diff --git a/NOTICE b/NOTICE
index dd1227b..da98a3e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -27,7 +27,7 @@  package are flexible, if you give me enough lead time.
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -330,7 +330,7 @@  the "copyright" line and a pointer to where the full notice is found.
 
     You 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
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -370,7 +370,7 @@  Public License instead of this License.
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    		    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -832,7 +832,7 @@  convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/aclocal.m4 b/aclocal.m4
index cfb42cd..394e90d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2874,7 +2874,7 @@  AC_DEFUN([AM_NLS],
 #
 # You 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.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/contrib/fallocate.c b/contrib/fallocate.c
index a05b8f2..d4273d8 100644
--- a/contrib/fallocate.c
+++ b/contrib/fallocate.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
  */
 
 #ifndef _LARGEFILE_SOURCE
diff --git a/include/nonunix/getopt.h b/include/nonunix/getopt.h
index 33ad46c..88b62fd 100644
--- a/include/nonunix/getopt.h
+++ b/include/nonunix/getopt.h
@@ -14,8 +14,8 @@ 
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 66d7512..557bf40 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -13,7 +13,7 @@ 
 #
 # You should have received a copy of the GNU Library 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.
 
 PACKAGE = @PACKAGE@
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 8284226..5b88d3a 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/config.charset b/intl/config.charset
index 43d45fb..d4964dc 100644
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -15,7 +15,7 @@ 
 #
 #   You should have received a copy of the GNU Library 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.
 #
 # The table consists of lines of the form
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 850acde..c2a63f0 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/dcigettext.c b/intl/dcigettext.c
index f5a99b5..52bb16e 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index 48a3e09..eb36833 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/dgettext.c b/intl/dgettext.c
index b64b0f5..9b0d0de 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/dngettext.c b/intl/dngettext.c
index 7815637..3278438 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/eval-plural.h b/intl/eval-plural.h
index 01bd5af..dacd003 100644
--- a/intl/eval-plural.h
+++ b/intl/eval-plural.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 STATIC
diff --git a/intl/explodename.c b/intl/explodename.c
index 52c25e7..1361418 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/finddomain.c b/intl/finddomain.c
index 4992a8c..498f858 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/gettext.c b/intl/gettext.c
index 92c42fa..d82d439 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/gettextP.h b/intl/gettextP.h
index 4d66c3d..ccd5e87 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _GETTEXTP_H
diff --git a/intl/gmo.h b/intl/gmo.h
index e7c9cc1..26515fe 100644
--- a/intl/gmo.h
+++ b/intl/gmo.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _GETTEXT_H
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 093e3b1..2c9a3a5 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* @@ end of prolog @@ */
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 96f9d95..15be09c 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/l10nflist.c b/intl/l10nflist.c
index c13d36d..ac0d2d7 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
diff --git a/intl/libgettext.h b/intl/libgettext.h
index c069fbd..d03d82b 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.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.  */
 
 /* Because on some systems (e.g. Solaris) we sometimes have to include
    the systems libintl.h as well as this file we have more complex
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
index 3be7eb9..c8c5620 100644
--- a/intl/libgnuintl.h.in
+++ b/intl/libgnuintl.h.in
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _LIBINTL_H
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 65e5ebd..d6408f2 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _LOADINFO_H
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 7fab71a..fc3689f 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localcharset.c b/intl/localcharset.c
index a3e3a9b..f9f411e 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
diff --git a/intl/localcharset.h b/intl/localcharset.h
index 3b137e7..129e4a4 100644
--- a/intl/localcharset.h
+++ b/intl/localcharset.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _LOCALCHARSET_H
diff --git a/intl/locale.alias b/intl/locale.alias
index bd6bb25..faa6969 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -13,7 +13,7 @@ 
 #
 # You should have received a copy of the GNU Library 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.
 
 # The format of this file is the same as for the corresponding file of
diff --git a/intl/localealias.c b/intl/localealias.c
index 2eaf881..7a092a0 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localename.c b/intl/localename.c
index 5662e54..9d65146 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
diff --git a/intl/log.c b/intl/log.c
index cb6076e..89f82df 100644
--- a/intl/log.c
+++ b/intl/log.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
diff --git a/intl/ngettext.c b/intl/ngettext.c
index e73e00c..a33529c 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/os2compat.c b/intl/os2compat.c
index c8dc33e..d041de2 100644
--- a/intl/os2compat.c
+++ b/intl/os2compat.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 #define OS2_AWARE
diff --git a/intl/os2compat.h b/intl/os2compat.h
index 4f74e8c..a18d582 100644
--- a/intl/os2compat.h
+++ b/intl/os2compat.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* When included from os2compat.h we need all the original definitions */
diff --git a/intl/osdep.c b/intl/osdep.c
index b372598..d2d8575 100644
--- a/intl/osdep.c
+++ b/intl/osdep.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 defined __EMX__
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index 8c04e64..1873be9 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/plural-exp.h b/intl/plural-exp.h
index 49e2c5b..f540184 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _PLURAL_EXP_H
diff --git a/intl/plural.c b/intl/plural.c
index 535305b..2219398 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -34,7 +34,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
@@ -315,8 +315,8 @@  static const short yycheck[] =
 
    You 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.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
diff --git a/intl/plural.y b/intl/plural.y
index 4d33bd7..fe79112 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -15,7 +15,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
diff --git a/intl/printf-args.c b/intl/printf-args.c
index f6f3219..f975901 100644
--- a/intl/printf-args.c
+++ b/intl/printf-args.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/printf-args.h b/intl/printf-args.h
index f11e64c..625b803 100644
--- a/intl/printf-args.h
+++ b/intl/printf-args.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _PRINTF_ARGS_H
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
index 416deda..5550a53 100644
--- a/intl/printf-parse.c
+++ b/intl/printf-parse.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/printf-parse.h b/intl/printf-parse.h
index 8aec50e..e785338 100644
--- a/intl/printf-parse.h
+++ b/intl/printf-parse.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _PRINTF_PARSE_H
diff --git a/intl/printf.c b/intl/printf.c
index 878646c..5e112b6 100644
--- a/intl/printf.c
+++ b/intl/printf.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/ref-add.sin b/intl/ref-add.sin
index 167374e..3678c28 100644
--- a/intl/ref-add.sin
+++ b/intl/ref-add.sin
@@ -14,7 +14,7 @@ 
 #
 #   You should have received a copy of the GNU Library 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.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
index 613cf37..0c12d8e 100644
--- a/intl/ref-del.sin
+++ b/intl/ref-del.sin
@@ -14,7 +14,7 @@ 
 #
 #   You should have received a copy of the GNU Library 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.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
diff --git a/intl/relocatable.c b/intl/relocatable.c
index bf7c708..a2e5aa7 100644
--- a/intl/relocatable.c
+++ b/intl/relocatable.c
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 
diff --git a/intl/relocatable.h b/intl/relocatable.h
index 48c5b71..614e64e 100644
--- a/intl/relocatable.h
+++ b/intl/relocatable.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _RELOCATABLE_H
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 8745a84..2bf6240 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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/intl/vasnprintf.c b/intl/vasnprintf.c
index 61bfb9e..76658d7 100644
--- a/intl/vasnprintf.c
+++ b/intl/vasnprintf.c
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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.  */
 
 /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
index 65f1bc1..5c62fb2 100644
--- a/intl/vasnprintf.h
+++ b/intl/vasnprintf.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _VASNPRINTF_H
diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
index d3cef4c..6ff03ce 100644
--- a/intl/vasnwprintf.h
+++ b/intl/vasnwprintf.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _VASNWPRINTF_H
diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
index 24a2cfc..600b89a 100644
--- a/intl/wprintf-parse.h
+++ b/intl/wprintf-parse.h
@@ -13,7 +13,7 @@ 
 
    You should have received a copy of the GNU Library 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 _WPRINTF_PARSE_H
diff --git a/intl/xsize.h b/intl/xsize.h
index e3707fa..b8925dc 100644
--- a/intl/xsize.h
+++ b/intl/xsize.h
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Library 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 _XSIZE_H
diff --git a/lib/ext2fs/rbtree.c b/lib/ext2fs/rbtree.c
index 9439303..5b92099 100644
--- a/lib/ext2fs/rbtree.c
+++ b/lib/ext2fs/rbtree.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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
   linux/lib/rbtree.c
 */
diff --git a/lib/ext2fs/rbtree.h b/lib/ext2fs/rbtree.h
index 1973b82..9e80677 100644
--- a/lib/ext2fs/rbtree.h
+++ b/lib/ext2fs/rbtree.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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
   linux/include/linux/rbtree.h
 
diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
index 9c1dd31..195a4c0 100644
--- a/lib/ext2fs/tdb.c
+++ b/lib/ext2fs/tdb.c
@@ -26,7 +26,7 @@  Last Changed Date: 2007-06-22 13:36:10 -0400 (Fri, 22 Jun 2007)
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
 #ifdef CONFIG_STAND_ALONE
diff --git a/lib/ext2fs/tdb.h b/lib/ext2fs/tdb.h
index 6a4086c..de7aa33 100644
--- a/lib/ext2fs/tdb.h
+++ b/lib/ext2fs/tdb.h
@@ -24,7 +24,7 @@ 
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
 #ifdef  __cplusplus
diff --git a/lib/ext2fs/tdb/patches/replace-includes b/lib/ext2fs/tdb/patches/replace-includes
index b1d0d57..f4181c1 100644
--- a/lib/ext2fs/tdb/patches/replace-includes
+++ b/lib/ext2fs/tdb/patches/replace-includes
@@ -3,7 +3,7 @@  Index: tdb/tdb.c
 --- tdb.orig/tdb.c
 +++ tdb/tdb.c
 @@ -29,11 +29,82 @@ Last Changed Date: 2007-06-22 13:36:10 -
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
  
 -#include "replace.h"