From: Brendan Cully <brendan@kublai.com>
Date: Sat, 17 Sep 2005 19:15:35 +0000 (+0000)
Subject: Update FSF address (via sed, I hope nothing got mangled). Closes: #2071.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=810895eadf881b6c63a7c434b9f7e9a04ece27a5;p=neomutt

Update FSF address (via sed, I hope nothing got mangled). Closes: #2071.
---

diff --git a/COPYRIGHT b/COPYRIGHT
index c0b382340..002bfa398 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -27,5 +27,5 @@ Copyright (C) 2000-2001 Edmund Grimley Evans <edmundo@rano.org>
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 
diff --git a/GPL b/GPL
index e782cef80..b6f92f3db 100644
--- a/GPL
+++ b/GPL
@@ -2,7 +2,7 @@
 		       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.
 
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -305,7 +305,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.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -338,4 +338,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
-$Id$
diff --git a/_regex.h b/_regex.h
index 8e2bd8f39..5a262103d 100644
--- a/_regex.h
+++ b/_regex.h
@@ -17,7 +17,7 @@
 
    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,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 #ifndef __REGEXP_LIBRARY_H__
diff --git a/account.c b/account.c
index d20d2fe11..56a1e955d 100644
--- a/account.c
+++ b/account.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* remote host account manipulation (POP/IMAP) */
diff --git a/account.h b/account.h
index e9fac082c..2ecd26a5d 100644
--- a/account.h
+++ b/account.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* remote host account manipulation (POP/IMAP) */
diff --git a/addrbook.c b/addrbook.c
index 15f78a422..7cb1760ec 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/alias.c b/alias.c
index 4a0f7da6a..d2d7d519e 100644
--- a/alias.c
+++ b/alias.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/ascii.c b/ascii.c
index 27f3a8619..cde04e1e3 100644
--- a/ascii.c
+++ b/ascii.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA 02111, USA.
  * 
  */
diff --git a/ascii.h b/ascii.h
index a6c1d2c37..6a63e4390 100644
--- a/ascii.h
+++ b/ascii.h
@@ -15,7 +15,7 @@
  * 
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA 02111, USA.
  * 
  */
diff --git a/attach.c b/attach.c
index a8521b3df..e5ba870fe 100644
--- a/attach.c
+++ b/attach.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/attach.h b/attach.h
index f859415c5..309981e41 100644
--- a/attach.h
+++ b/attach.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* common protos for compose / attach menus */
diff --git a/base64.c b/base64.c
index 4e632922d..9c2dee878 100644
--- a/base64.c
+++ b/base64.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330, 
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  *     Boston, MA  02111, USA.
  * 
  */
diff --git a/browser.c b/browser.c
index 2f29dd241..5b46a9722 100644
--- a/browser.c
+++ b/browser.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/browser.h b/browser.h
index 3da490ab8..c8703d006 100644
--- a/browser.h
+++ b/browser.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _BROWSER_H
diff --git a/buffy.c b/buffy.c
index adfa45a3c..02cd83622 100644
--- a/buffy.c
+++ b/buffy.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/buffy.h b/buffy.h
index e04e7c5bc..76b7bec5e 100644
--- a/buffy.h
+++ b/buffy.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /*parameter to mutt_parse_mailboxes*/
diff --git a/charset.c b/charset.c
index 4dc0f3be0..d6cb85aaa 100644
--- a/charset.c
+++ b/charset.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/charset.h b/charset.h
index cfc2ac53e..55d49bdd7 100644
--- a/charset.h
+++ b/charset.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifndef _CHARSET_H
diff --git a/color.c b/color.c
index edf7c8c3f..560afd2cf 100644
--- a/color.c
+++ b/color.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/commands.c b/commands.c
index 141512bef..eefe4a841 100644
--- a/commands.c
+++ b/commands.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/complete.c b/complete.c
index c1a721563..0a1060ece 100644
--- a/complete.c
+++ b/complete.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/compose.c b/compose.c
index 205d04ec1..2d37ecbc0 100644
--- a/compose.c
+++ b/compose.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/config.guess b/config.guess
index cc726cd15..b8fe2c0e3 100755
--- a/config.guess
+++ b/config.guess
@@ -17,7 +17,7 @@ timestamp='2003-02-22'
 #
 # You should have received a copy of the GNU General Public 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 02111-1307, 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/config.sub b/config.sub
index 9772e87d2..524b94892 100755
--- a/config.sub
+++ b/config.sub
@@ -21,7 +21,7 @@ timestamp='2003-02-22'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
diff --git a/copy.c b/copy.c
index 8dbec08c6..a19830ecd 100644
--- a/copy.c
+++ b/copy.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/copy.h b/copy.h
index f0a9b86bf..6832eb3e5 100644
--- a/copy.h
+++ b/copy.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* flags to _mutt_copy_message */
diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index feb28ed93..b5963a847 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -17,7 +17,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/crypt-gpgme.h b/crypt-gpgme.h
index 0d66ddff7..4ccd7d605 100644
--- a/crypt-gpgme.h
+++ b/crypt-gpgme.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifndef CRYPT_GPGME_H
diff --git a/crypt-mod-pgp-classic.c b/crypt-mod-pgp-classic.c
index d3b471b61..12ef298dc 100644
--- a/crypt-mod-pgp-classic.c
+++ b/crypt-mod-pgp-classic.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /* 
diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 45e5b9c81..06549b65e 100644
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /* 
diff --git a/crypt-mod-smime-classic.c b/crypt-mod-smime-classic.c
index 0d038732e..fd123d5d1 100644
--- a/crypt-mod-smime-classic.c
+++ b/crypt-mod-smime-classic.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /* 
diff --git a/crypt-mod-smime-gpgme.c b/crypt-mod-smime-gpgme.c
index 8b180c2b9..d34dbd6bb 100644
--- a/crypt-mod-smime-gpgme.c
+++ b/crypt-mod-smime-gpgme.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /* 
diff --git a/crypt-mod.c b/crypt-mod.c
index 4be1e4356..bd4ac3d5f 100644
--- a/crypt-mod.c
+++ b/crypt-mod.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/crypt-mod.h b/crypt-mod.h
index 133b784bc..710a3add0 100644
--- a/crypt-mod.h
+++ b/crypt-mod.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifndef CRYPTOGRAPHY_H
diff --git a/crypt.c b/crypt.c
index ca2fb0472..8cc877928 100644
--- a/crypt.c
+++ b/crypt.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/cryptglue.c b/cryptglue.c
index ae4ecbf91..9e51b6ccc 100644
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /*
diff --git a/curs_lib.c b/curs_lib.c
index 44ecbee8d..d45b05b9e 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/curs_main.c b/curs_main.c
index 1454f3b4d..4e581846d 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/date.c b/date.c
index b97b1134e..f998ee800 100644
--- a/date.c
+++ b/date.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/depcomp b/depcomp
index 51606f8c4..b0219db1f 100644
--- a/depcomp
+++ b/depcomp
@@ -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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
diff --git a/doc/dotlock.man b/doc/dotlock.man
index e8a4ce660..0bd940685 100644
--- a/doc/dotlock.man
+++ b/doc/dotlock.man
@@ -16,7 +16,7 @@
 .\" 
 .\"     You should have received a copy of the GNU General Public License
 .\"     along with this program; if not, write to the Free Software
-.\"     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 .\"
 .TH dotlock 1 "AUGUST 1999" Unix "User Manuals"
 .SH NAME
diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index b04d6ae97..8ff6be6c1 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -170,7 +170,7 @@ GNU General Public License for more details.
 <para>
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 </para>
 
 </sect2>
diff --git a/doc/mutt.man b/doc/mutt.man
index ea5f36448..fce8e940d 100644
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -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, USA.
+.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 .\"
 .TH mutt 1 "January 2002" Unix "User Manuals"
 .SH NAME
diff --git a/doc/muttbug.man b/doc/muttbug.man
index 695bdf006..6a2517410 100644
--- a/doc/muttbug.man
+++ b/doc/muttbug.man
@@ -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, USA.
+.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 .\"
 .TH flea 1 "January 2005" Unix "User Manuals"
 .SH NAME
diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index 9823d0527..e67c81234 100644
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -16,7 +16,7 @@
 .\" 
 .\"     You should have received a copy of the GNU General Public License
 .\"     along with this program; if not, write to the Free Software
-.\"     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 .\"
 .TH muttrc 5 "September 2002" Unix "User Manuals"
 .SH NAME
diff --git a/dotlock.c b/dotlock.c
index 97edacc54..fa8b774cd 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/dotlock.h b/dotlock.h
index dff6f61ce..26358098d 100644
--- a/dotlock.h
+++ b/dotlock.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _DOTLOCK_H
diff --git a/edit.c b/edit.c
index fa0633c60..b164629b4 100644
--- a/edit.c
+++ b/edit.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* Close approximation of the mailx(1) builtin editor for sending mail. */
diff --git a/editmsg.c b/editmsg.c
index 0d037d4f4..4c0da2dcf 100644
--- a/editmsg.c
+++ b/editmsg.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/enter.c b/enter.c
index 846ffae4b..5365bd33d 100644
--- a/enter.c
+++ b/enter.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/extlib.c b/extlib.c
index 2dda7fd88..4c146b487 100644
--- a/extlib.c
+++ b/extlib.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/filter.c b/filter.c
index 862ebbd1e..27ac3d4ca 100644
--- a/filter.c
+++ b/filter.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/flags.c b/flags.c
index 882fd496c..166e20010 100644
--- a/flags.c
+++ b/flags.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/from.c b/from.c
index c26d5b1a6..692486152 100644
--- a/from.c
+++ b/from.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/functions.h b/functions.h
index 6e1be51a7..828b736d8 100644
--- a/functions.h
+++ b/functions.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/globals.h b/globals.h
index 3f6879f79..aee7f5684 100644
--- a/globals.h
+++ b/globals.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 WHERE void (*mutt_error) (const char *, ...);
diff --git a/gnupgparse.c b/gnupgparse.c
index caf2f21f0..b97616dbe 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -16,7 +16,7 @@
  *
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/handler.c b/handler.c
index e7c3e3230..c93828a6f 100644
--- a/handler.c
+++ b/handler.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/hash.c b/hash.c
index a4c72916e..e7e801571 100644
--- a/hash.c
+++ b/hash.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/hash.h b/hash.h
index 2344077e3..529d3a198 100644
--- a/hash.h
+++ b/hash.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifndef _HASH_H
diff --git a/hcache.c b/hcache.c
index 17dbabd48..d6be8be06 100644
--- a/hcache.c
+++ b/hcache.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/hdrline.c b/hdrline.c
index 55171d51f..2c11a5aab 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/headers.c b/headers.c
index af70a7b26..59f00410b 100644
--- a/headers.c
+++ b/headers.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/help.c b/help.c
index a4985a9de..8e074966d 100644
--- a/help.c
+++ b/help.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #define HELP_C
diff --git a/history.c b/history.c
index 5f335692a..dc1e0a941 100644
--- a/history.c
+++ b/history.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/history.h b/history.h
index b32a47a98..928afb4c6 100644
--- a/history.h
+++ b/history.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _HISTORY_H
diff --git a/hook.c b/hook.c
index 6540988d1..af55d6b6b 100644
--- a/hook.c
+++ b/hook.c
@@ -13,7 +13,7 @@
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/imap/auth.c b/imap/auth.c
index d52f86fb0..db1df2ca7 100644
--- a/imap/auth.c
+++ b/imap/auth.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* IMAP login/authentication code */
diff --git a/imap/auth.h b/imap/auth.h
index 608efc266..afed5806f 100644
--- a/imap/auth.h
+++ b/imap/auth.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* common defs for authenticators. A good place to set up a generic callback
diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 6610374b3..59d29ce2d 100644
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* IMAP login/authentication code */
diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index e2eebeb2c..711633674 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* IMAP login/authentication code */
diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index e687fbdea..9f0a75ced 100644
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* GSS login/authentication code */
diff --git a/imap/auth_login.c b/imap/auth_login.c
index 722ab5d91..ca5786833 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* plain LOGIN support */
diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index aae03ea0e..693c3bb06 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* SASL login/authentication code */
diff --git a/imap/browse.c b/imap/browse.c
index 4d1d445e1..2536eda6c 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* Mutt browser support routines */
diff --git a/imap/command.c b/imap/command.c
index 82f06c802..5455a767b 100644
--- a/imap/command.c
+++ b/imap/command.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* command.c: routines for sending commands to an IMAP server and parsing
diff --git a/imap/imap.c b/imap/imap.c
index 47ee3b565..dca59f1ad 100644
--- a/imap/imap.c
+++ b/imap/imap.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
diff --git a/imap/imap.h b/imap/imap.h
index b074519b0..4685b337f 100644
--- a/imap/imap.h
+++ b/imap/imap.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _IMAP_H
diff --git a/imap/imap_private.h b/imap/imap_private.h
index ba536deff..3e9663f6e 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _IMAP_PRIVATE_H
diff --git a/imap/message.c b/imap/message.c
index 59cd9e11d..2f46f2bfe 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *
  * $Id$
  */ 
diff --git a/imap/message.h b/imap/message.h
index 78c5dc3e3..44196ff4a 100644
--- a/imap/message.h
+++ b/imap/message.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* message.c data structures */
diff --git a/imap/utf7.c b/imap/utf7.c
index 29564fb2a..6c45d3d97 100644
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/imap/util.c b/imap/util.c
index 4c4f3f820..c5f491ef1 100644
--- a/imap/util.c
+++ b/imap/util.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* general IMAP utility functions */
diff --git a/init.c b/init.c
index fb491f42b..239f27832 100644
--- a/init.c
+++ b/init.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/init.h b/init.h
index bad607c9c..ca21b828b 100644
--- a/init.h
+++ b/init.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifdef _MAKEDOC
diff --git a/intl/COPYING.LIB-2 b/intl/COPYING.LIB-2
index 161a3d1d4..f3c91297f 100644
--- a/intl/COPYING.LIB-2
+++ b/intl/COPYING.LIB-2
@@ -2,7 +2,7 @@
 		       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 02111-1307, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -464,7 +464,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,
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     MA 02111-1307, USA
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 19ed4a7e0..0f396cb00 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 02111-1307,
 # USA.
 
 PACKAGE = @PACKAGE@
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index c6a9bd164..9b6f59a95 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/config.charset b/intl/config.charset
index f4f2611c5..c21b26759 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 02111-1307,
 #   USA.
 #
 # The table consists of lines of the form
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index b7c96523d..1b63f4ea7 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 6acde195f..bcf15232c 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 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index c16af2126..242bec5b9 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 3651207a0..7c3a57555 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dngettext.c b/intl/dngettext.c
index f214e95b4..c6a94ad6b 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/explodename.c b/intl/explodename.c
index 2985064c9..2ccb44edc 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 2f103d556..cb2c5ed56 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/gettext.c b/intl/gettext.c
index 22a6c2453..d2ff74d91 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/gettext.h b/intl/gettext.h
index 6f5d76055..bcef4fe38 100644
--- a/intl/gettext.h
+++ b/intl/gettext.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 02111-1307,
    USA.  */
 
 #ifndef _GETTEXT_H
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 43de1cd47..50789d66d 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 02111-1307,
    USA.  */
 
 #ifndef _GETTEXTP_H
diff --git a/intl/hash-string.h b/intl/hash-string.h
index ccb7acca6..8e7e7a02a 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 02111-1307,
    USA.  */
 
 /* @@ end of prolog @@ */
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 0a06ce947..3ee8a084c 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 8e2605bc3..17a90933d 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 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
diff --git a/intl/libgettext.h b/intl/libgettext.h
index c5be54a80..9c833a74f 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.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 02111-1307,
    USA.  */
 
 #ifndef _LIBGETTEXT_H
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index f891deb96..786fb8a67 100644
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.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 02111-1307,
    USA.  */
 
 #ifndef _LIBINTL_H
diff --git a/intl/libintl.glibc b/intl/libintl.glibc
index 7298852f7..2ea0cc271 100644
--- a/intl/libintl.glibc
+++ b/intl/libintl.glibc
@@ -14,7 +14,7 @@
 
    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,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _LIBINTL_H
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index b8612607b..d14c589ae 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 02111-1307,
    USA.  */
 
 #ifndef _LOADINFO_H
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index a06134a1d..d41c9fd27 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 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 61f8f3e85..b0916b27a 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 02111-1307,
    USA.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
diff --git a/intl/locale.alias b/intl/locale.alias
index bd7b9b31e..b2860adb9 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 02111-1307,
 # 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 f57d76442..3b2340257 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 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/ngettext.c b/intl/ngettext.c
index fb3ec5a91..9fbdc0a0d 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/plural.c b/intl/plural.c
index 640d43cc5..4521b5c29 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -35,7 +35,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 02111-1307,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
@@ -321,7 +321,7 @@ static const short yycheck[] = {     1,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
diff --git a/intl/plural.y b/intl/plural.y
index be049a6d4..46ac0dfac 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 02111-1307,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
index 167374e3c..42b5bd3aa 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 02111-1307,
 #   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
index 613cf37f3..54d55edbf 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 02111-1307,
 #   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 2e420ad77..409300ac0 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 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/keymap.c b/keymap.c
index c0e0861e1..557be8c61 100644
--- a/keymap.c
+++ b/keymap.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/keymap.h b/keymap.h
index 4a75c6a16..5f29ee4dd 100644
--- a/keymap.h
+++ b/keymap.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef KEYMAP_H
diff --git a/lib.c b/lib.c
index 6df0f2208..07fddcabb 100644
--- a/lib.c
+++ b/lib.c
@@ -16,7 +16,7 @@
  * 
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/lib.h b/lib.h
index 164014f4e..98805f3dd 100644
--- a/lib.h
+++ b/lib.h
@@ -16,7 +16,7 @@
  * 
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/mailbox.h b/mailbox.h
index afd743ea6..9f13e8ade 100644
--- a/mailbox.h
+++ b/mailbox.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _MAILBOX_H
diff --git a/main.c b/main.c
index 2fed86322..6d7890547 100644
--- a/main.c
+++ b/main.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #define MAIN_C 1
@@ -91,7 +91,7 @@ static const char *Licence = N_("\
 static const char *Obtaining = N_("\
     You should have received a copy of the GNU General Public License\n\
     along with this program; if not, write to the Free Software\n\
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n\
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n\
 ");
 
 void mutt_exit (int code)
diff --git a/makedoc.c b/makedoc.c
index 1bcb83ebf..83ff99f71 100644
--- a/makedoc.c
+++ b/makedoc.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /**
diff --git a/mapping.h b/mapping.h
index b944e2a02..365de167b 100644
--- a/mapping.h
+++ b/mapping.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef MAPPING_H
diff --git a/mbox.c b/mbox.c
index 81ad81dd2..c24e5683c 100644
--- a/mbox.c
+++ b/mbox.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
diff --git a/mbyte.c b/mbyte.c
index ea32a85c7..4da7e7c6d 100644
--- a/mbyte.c
+++ b/mbyte.c
@@ -13,7 +13,7 @@
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /*
diff --git a/menu.c b/menu.c
index f978a1b40..5532fd2dc 100644
--- a/menu.c
+++ b/menu.c
@@ -13,7 +13,7 @@
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/mh.c b/mh.c
index 745fed335..a495baff9 100644
--- a/mh.c
+++ b/mh.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /*
diff --git a/mime.h b/mime.h
index ebef53e19..24405b994 100644
--- a/mime.h
+++ b/mime.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* Content-Type */
diff --git a/missing b/missing
index 6a37006e8..1c4d126c3 100755
--- a/missing
+++ b/missing
@@ -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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
diff --git a/mutt.h b/mutt.h
index f7535a616..32326aac9 100644
--- a/mutt.h
+++ b/mutt.h
@@ -15,7 +15,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef MUTT_H
diff --git a/mutt_crypt.h b/mutt_crypt.h
index acb356fe0..423b64947 100644
--- a/mutt_crypt.h
+++ b/mutt_crypt.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/mutt_curses.h b/mutt_curses.h
index 5f2a84aeb..c1ff80388 100644
--- a/mutt_curses.h
+++ b/mutt_curses.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _MUTT_CURSES_H_
diff --git a/mutt_idna.c b/mutt_idna.c
index bc7a976a2..d8b90d267 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/mutt_idna.h b/mutt_idna.h
index 4b4851629..e7b85e78f 100644
--- a/mutt_idna.h
+++ b/mutt_idna.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _MUTT_IDNA_H
diff --git a/mutt_menu.h b/mutt_menu.h
index 77b6df746..d0ab47f2d 100644
--- a/mutt_menu.h
+++ b/mutt_menu.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 /*
diff --git a/mutt_regex.h b/mutt_regex.h
index 0f37d9d18..265a05de5 100644
--- a/mutt_regex.h
+++ b/mutt_regex.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/mutt_sasl.c b/mutt_sasl.c
index d46e684e4..5c962b290 100644
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* common SASL helper routines */
diff --git a/mutt_sasl.h b/mutt_sasl.h
index 7765b3393..cf7c8250b 100644
--- a/mutt_sasl.h
+++ b/mutt_sasl.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* common SASL helper routines */
diff --git a/mutt_socket.c b/mutt_socket.c
index 4b33d3ec7..86ddbe5f6 100644
--- a/mutt_socket.c
+++ b/mutt_socket.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/mutt_socket.h b/mutt_socket.h
index 5483cb6fc..df89f14f9 100644
--- a/mutt_socket.h
+++ b/mutt_socket.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _MUTT_SOCKET_H_
diff --git a/mutt_ssl.c b/mutt_ssl.c
index b670f2763..626ca9e7e 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/mutt_ssl.h b/mutt_ssl.h
index c1019f06e..4e3812c07 100644
--- a/mutt_ssl.h
+++ b/mutt_ssl.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _MUTT_SSL_H_
diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 17f1ad1f9..cb8f86159 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -13,7 +13,7 @@
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index b1f0bf40b..a6fa9f675 100644
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -14,7 +14,7 @@
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/mutt_tunnel.h b/mutt_tunnel.h
index b6e20afdf..4c7bd86af 100644
--- a/mutt_tunnel.h
+++ b/mutt_tunnel.h
@@ -11,7 +11,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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifndef _MUTT_TUNNEL_H_
diff --git a/muttbug.sh.in b/muttbug.sh.in
index 80b37053a..8046419f8 100644
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -24,7 +24,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, USA.
+#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 #
 
 exec >&2
diff --git a/muttlib.c b/muttlib.c
index 2f28dd786..e3a92e0a9 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/mx.c b/mx.c
index a18d9b5e9..42cccb7ab 100644
--- a/mx.c
+++ b/mx.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/mx.h b/mx.h
index 62d84b492..6520a910e 100644
--- a/mx.h
+++ b/mx.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/pager.c b/pager.c
index ffa742c06..6283fa962 100644
--- a/pager.c
+++ b/pager.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/pager.h b/pager.h
index 68f4c2cfc..1427e71be 100644
--- a/pager.h
+++ b/pager.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #include "attach.h"
diff --git a/parse.c b/parse.c
index e9c12a57b..7cbd82777 100644
--- a/parse.c
+++ b/parse.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/pattern.c b/pattern.c
index 8b750438e..98b05bac1 100644
--- a/pattern.c
+++ b/pattern.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/pgp.c b/pgp.c
index f78d8fd8e..516d049c8 100644
--- a/pgp.c
+++ b/pgp.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/pgp.h b/pgp.h
index 52d930f5b..94320e098 100644
--- a/pgp.h
+++ b/pgp.h
@@ -15,7 +15,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
diff --git a/pgpinvoke.c b/pgpinvoke.c
index ac3145a47..127813d8a 100644
--- a/pgpinvoke.c
+++ b/pgpinvoke.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/pgpkey.c b/pgpkey.c
index aa686427f..149319a03 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -16,7 +16,7 @@
  * 
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/pgplib.c b/pgplib.c
index 258b1c3cb..f4a24c30d 100644
--- a/pgplib.c
+++ b/pgplib.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/pgplib.h b/pgplib.h
index 9b2b5d56e..cb3a82721 100644
--- a/pgplib.h
+++ b/pgplib.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
diff --git a/pgpmicalg.c b/pgpmicalg.c
index fb8d410fd..00be9f091 100644
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -13,7 +13,7 @@
  * 
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02111, USA.
  */
 
diff --git a/pgppacket.c b/pgppacket.c
index 8a4e11e9c..ff248d2de 100644
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -13,7 +13,7 @@
  * 
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02111, USA.
  */
 
diff --git a/pgppacket.h b/pgppacket.h
index 4b7fd6474..79a99b89e 100644
--- a/pgppacket.h
+++ b/pgppacket.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,
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02111, USA.
  */
 
diff --git a/pgppubring.c b/pgppubring.c
index fcd4a0b35..d7a8a468c 100644
--- a/pgppubring.c
+++ b/pgppubring.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/po/bg.po b/po/bg.po
index a0a4708b3..b3fb21134 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3206,7 +3206,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Àâòîðñêî ïðàâî (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Àâòîðñêî ïðàâî (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3232,7 +3232,7 @@ msgstr ""
 "    Áè òðÿáâàëî äà ñòå ïîëó÷èëè êîïèå îò GNU General Public License\n"
 "    çàåäíî ñ òàçè ïðîãðàìà; àêî òîâà íå å òàêà, ìîëÿ ïèøåòå íà Free "
 "Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/ca.po b/po/ca.po
index c8793b1ce..ee28c0a16 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3311,7 +3311,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright © 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright © 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3339,7 +3339,7 @@ msgstr ""
 "\n"
 "    Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n"
 "    juntament amb aquest programa; en cas contrari, escriviu a la Free\n"
-"    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
+"    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
 "    MA  02111, USA.\n"
 
 #: main.c:107
diff --git a/po/cs.po b/po/cs.po
index aabfbfd31..bb920b05f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3741,7 +3741,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2003 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2003 Brandon Long <blong@fiction.net>\n"
@@ -3770,7 +3770,7 @@ msgstr ""
 "\n"
 "  Kopie Obecné veøejné licence GNU mìla být dodána spolu s tímto programem;\n"
 "pokud se tak nestalo, napi¹te o ni Free Software Foundation, Inc.,\n"
-"59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 "\n"
 
 #
diff --git a/po/da.po b/po/da.po
index 129a89f58..24214efa4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3170,7 +3170,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3195,7 +3195,7 @@ msgstr ""
 "\n"
 "    Du skulle have modtaget en kopi af GNU General Public License\n"
 "    sammen med dette program; hvis ikke, så skriv til The Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/de.po b/po/de.po
index a59988039..2784045fa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3162,7 +3162,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3189,7 +3189,7 @@ msgstr ""
 "\n"
 "    Sie sollten eine Kopie der GNU General Public License zusammen mit\n"
 "    diesem Programm erhalten haben; falls nicht, schreiben sie an Free\n"
-"    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
+"    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  "
 "02111, USA.\n"
 
 #: main.c:107
diff --git a/po/el.po b/po/el.po
index 550731d68..ad383a4b0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3810,7 +3810,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3837,7 +3837,7 @@ msgstr ""
 "\n"
 "Èá Ýðñåðå íá Ý÷åôå ëÜâåé Ýíá áíôßãñáöï ôçò GNU ÃåíéêÞò Äçìüóéáò ¶äåéáò\n"
 "ìå áõôü ôï ðñüãñáììá. ÅÜí ü÷é, ãñÜøôå óôï Free Software \n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 "\n"
 
 #
diff --git a/po/eo.po b/po/eo.po
index dbd136c86..10bcd0fbc 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3185,7 +3185,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Kopirajto (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Kopirajto (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3210,7 +3210,7 @@ msgstr ""
 "\n"
 "    Vi devus esti ricevinta kopion de la Øenerala Publika Rajtigilo de\n"
 "    GNU kun æi tiu programo; se ne, skribu al Free Software Foundation,\n"
-"    Inc., 59 Temple Place - Suite 330, Boston, MA  02111, Usono.\n"
+"    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, Usono.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/es.po b/po/es.po
index 08a404884..aede948fa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3234,7 +3234,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
@@ -3262,7 +3262,7 @@ msgstr ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/et.po b/po/et.po
index 38d2025c9..fb3cac99e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3190,7 +3190,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Autoriõigus (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Autoriõigus (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3214,7 +3214,7 @@ msgstr ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/fr.po b/po/fr.po
index 4a8bf8dd1..a8a181c85 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3275,7 +3275,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3300,7 +3300,7 @@ msgstr ""
 "\n"
 "    Vous devez avoir reçu un exemplaire de la GNU General Public License\n"
 "    avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 msgid ""
diff --git a/po/ga.po b/po/ga.po
index cc72d7f4b..000184b9d 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -3158,7 +3158,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright © 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright © 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3183,7 +3183,7 @@ msgstr ""
 "Ba chóir go mbeifeá tar éis cóip den GNU General Public License a fháil in\n"
 "éineacht leis an ríomhchlár seo; mura bhfuair, scríobh chuig an Free "
 "Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.\n"
 
 #: main.c:107
 msgid ""
diff --git a/po/gl.po b/po/gl.po
index 4a220f901..37c23c772 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3243,7 +3243,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
@@ -3268,7 +3268,7 @@ msgstr ""
 "\n"
 "    Debería haber recibido unha copia da Licencia Pública Xeral de GNU\n"
 "    xunto deste programa; se non foi así, escriba á Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/hu.po b/po/hu.po
index 6f47dd0d3..63349bbfc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3193,7 +3193,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3217,7 +3217,7 @@ msgstr ""
 "\n"
 "    Ezzel a programmal meg kellett kapnod a GNU General Public License\n"
 "    másolatát; ha nem, írj a Szabad Szoftver Alapítványnak: Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/id.po b/po/id.po
index 4d09f9f09..3abc23047 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3164,7 +3164,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Hak Cipta (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Hak Cipta (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3190,7 +3190,7 @@ msgstr ""
 "\n"
 "    Anda seharusnya sudah menerima salinan dari GNU General Public License\n"
 "    bersama dengan program ini; jika tidak, silakan bersurat kepada\n"
-"    Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
+"    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  "
 "02111, USA.\n"
 
 #: main.c:107
diff --git a/po/it.po b/po/it.po
index e3cd0e530..2feb29b90 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3183,7 +3183,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3208,7 +3208,7 @@ msgstr ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/ja.po b/po/ja.po
index 791f63c9f..02dc0fa16 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3161,7 +3161,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 
 #: main.c:107
diff --git a/po/ko.po b/po/ko.po
index 9595a4e93..ff97e3d96 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3184,7 +3184,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3209,7 +3209,7 @@ msgstr ""
 "\n"
 "    º» ÇÁ·Î±×·¥¿¡´Â GNU General Public License º¹»çº»ÀÌ Æ÷ÇÔ µÇ¾îÀÖ½À´Ï´Ù;\n"
 "    Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ» °æ¿ì ¾Æ·¡ÀÇ ÁÖ¼Ò·Î ¿¬¶ôÇϽñ⠹ٶø´Ï´Ù.\n"
-"    Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
+"    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  "
 "02111, USA.\n"
 
 #: main.c:107
diff --git a/po/lt.po b/po/lt.po
index 215308086..008b5aea2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3241,7 +3241,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
@@ -3267,7 +3267,7 @@ msgstr ""
 "\n"
 "    Tu turëjai gauti GNU General Public License kopijà\n"
 "    kartu su ðia programa; jeigu ne, paraðyk á Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/nl.po b/po/nl.po
index b77d79b80..d575c7a9e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3150,7 +3150,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
diff --git a/po/pl.po b/po/pl.po
index 56aa1d4ed..51e3dcf62 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3185,7 +3185,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3211,7 +3211,7 @@ msgstr ""
 "\n"
 "   W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n"
 "   Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n"
-"   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
+"   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 99cfd0994..97256e9ee 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3260,7 +3260,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
diff --git a/po/ru.po b/po/ru.po
index cedd05e07..2accff597 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3181,7 +3181,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3206,7 +3206,7 @@ msgstr ""
 "\n"
 "   ÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ GNU General Public License ×ÍÅÓÔÅ Ó\n"
 "   ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ. åÓÌÉ ×Ù ÅÅ ÎÅ ÐÏÌÕÞÉÌÉ, ÏÂÒÁÔÉÔÅÓØ ×Ï Free Software\n"
-"   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n"
+"   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/sk.po b/po/sk.po
index ee9eb7407..1c91fa005 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3267,7 +3267,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n"
@@ -3289,7 +3289,7 @@ msgstr ""
 "\n"
 "    Mali by ste obdr¾a» kópiu GNU General Public License spolu s týmto\n"
 "    programom; ak nie, napí¹te do Free Software Foundation, Inc.,\n"
-"    59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 
 #: main.c:107
 #, fuzzy
diff --git a/po/sv.po b/po/sv.po
index ca74adc75..aa76df315 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3179,7 +3179,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Upphovsrätt (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Upphovsrätt (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3206,7 +3206,7 @@ msgstr ""
 "    General Public License för ytterligare information.\n"
 "    Du bör ha fått en kopia av GNU General Public License\n"
 "    tillsammans med detta program. Om inte, skriv till Free Software \n"
-"    Foundation,Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
+"    Foundation,Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
 "USA.\n"
 
 #: main.c:107
diff --git a/po/tr.po b/po/tr.po
index 025e04902..a8080f411 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3244,7 +3244,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 
 #: main.c:107
diff --git a/po/uk.po b/po/uk.po
index c20ca5f9e..157a86479 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3182,7 +3182,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 
 #: main.c:107
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 409f9084b..b5e434cff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
 "    Öн«»á»ñµÃ¸ü¶à×ÊÁÏ¡£\n"
 "\n"
 "    ÄúÓ¦ÒÑÁ¬Í¬Ó¦ÓóÌÐòÊÕµ½Ò»·Ý GNU Ò»°ã¹«¹²ÊÚȨÊ飻Èç¹ûûÓУ¬ÇëдÐÅ\n"
-"    ÖÁ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
+"    ÖÁ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
 "MA  02111, USA.\n"
 
 #: main.c:107
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5cd8a0066..88c854cfe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3231,7 +3231,7 @@ msgid ""
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.\n"
 msgstr ""
 "版權所有 (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "版權所有 (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
@@ -3252,7 +3252,7 @@ msgstr ""
 "    中將會獲得更多資料。\n"
 "\n"
 "    您應已連同應用程式收到一份 GNU 一般公共授權書；如果沒有，請寫信\n"
-"    至 Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+"    至 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "    Boston, MA  02111, USA.\n"
 
 #: main.c:107
diff --git a/pop.c b/pop.c
index d08f3382c..480fd9a7c 100644
--- a/pop.c
+++ b/pop.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/pop.h b/pop.h
index 00d49f94c..5685e2585 100644
--- a/pop.h
+++ b/pop.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _POP_H
diff --git a/pop_auth.c b/pop_auth.c
index 1710b0b0d..3d4d8eb50 100644
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/pop_lib.c b/pop_lib.c
index 5a13b85fd..38cd2c290 100644
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/postpone.c b/postpone.c
index 973c4e041..b79d78599 100644
--- a/postpone.c
+++ b/postpone.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/protos.h b/protos.h
index 2ce8253c1..41d706780 100644
--- a/protos.h
+++ b/protos.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 
diff --git a/query.c b/query.c
index 90dc61417..b943f6444 100644
--- a/query.c
+++ b/query.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/recvattach.c b/recvattach.c
index c1653d9bb..1d4069f2c 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/recvcmd.c b/recvcmd.c
index 20fe5ffb7..32d8a83e5 100644
--- a/recvcmd.c
+++ b/recvcmd.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA. 
  */
 
diff --git a/regex.c b/regex.c
index 7ed83d954..a36cbbec4 100644
--- a/regex.c
+++ b/regex.c
@@ -20,7 +20,7 @@
  * 
  * 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,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02111-1307, USA.  
  */
 
diff --git a/remailer.c b/remailer.c
index ec8e98a4d..89a6a7ea4 100644
--- a/remailer.c
+++ b/remailer.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */ 
 
diff --git a/remailer.h b/remailer.h
index c7469170a..f0d6a209f 100644
--- a/remailer.h
+++ b/remailer.h
@@ -16,7 +16,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*
diff --git a/resize.c b/resize.c
index 81cd729ab..45e2bbd37 100644
--- a/resize.c
+++ b/resize.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/rfc1524.c b/rfc1524.c
index e9ae6e191..948b37e24 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /* 
diff --git a/rfc1524.h b/rfc1524.h
index 8259d2df5..bc077a520 100644
--- a/rfc1524.h
+++ b/rfc1524.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef _RFC1524_H
diff --git a/rfc2047.c b/rfc2047.c
index f25ff6d83..b6b8bce4f 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -14,7 +14,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/rfc2047.h b/rfc2047.h
index f6e0bbf9a..9ffdbe4b8 100644
--- a/rfc2047.h
+++ b/rfc2047.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 char *mutt_choose_charset (const char *fromcode, const char *charsets,
diff --git a/rfc2231.c b/rfc2231.c
index ad03be976..a486990ca 100644
--- a/rfc2231.c
+++ b/rfc2231.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,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/rfc2231.h b/rfc2231.h
index ccf01cc3d..9976d34f2 100644
--- a/rfc2231.h
+++ b/rfc2231.h
@@ -15,7 +15,7 @@
  *
  *     You should have received a copy of the GNU General Public
  *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *     Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *     Boston, MA  02111, USA.
  */
 
diff --git a/rfc822.c b/rfc822.c
index 12318db8c..c76668a13 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/rfc822.h b/rfc822.h
index d141ba89d..eefabb84d 100644
--- a/rfc822.h
+++ b/rfc822.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #ifndef rfc822_h
diff --git a/score.c b/score.c
index 3913aa864..a33242b13 100644
--- a/score.c
+++ b/score.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/send.c b/send.c
index 29b319877..e200f780d 100644
--- a/send.c
+++ b/send.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/sendlib.c b/sendlib.c
index 19a568494..20ff128e3 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #define _SENDLIB_C 1
diff --git a/signal.c b/signal.c
index 05be6b061..01bf39a89 100644
--- a/signal.c
+++ b/signal.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/smime.c b/smime.c
index c4b462bac..dd65460f5 100644
--- a/smime.c
+++ b/smime.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 #if HAVE_CONFIG_H
diff --git a/smime.h b/smime.h
index 138129455..9a2df948c 100644
--- a/smime.h
+++ b/smime.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */
 
 
diff --git a/smime_keys.pl b/smime_keys.pl
index 773eff958..f4d4e83a7 100755
--- a/smime_keys.pl
+++ b/smime_keys.pl
@@ -16,7 +16,7 @@
 # 
 #     You should have received a copy of the GNU General Public License
 #     along with this program; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
 
 use strict;
 use File::Copy;
diff --git a/sort.c b/sort.c
index 6e1c29f7a..482d5464d 100644
--- a/sort.c
+++ b/sort.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/sort.h b/sort.h
index 880fb9d25..9b9f6d2a1 100644
--- a/sort.h
+++ b/sort.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, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #define SORT_DATE	1   /* the date the mail was sent. */
diff --git a/status.c b/status.c
index ecd9bc6e0..d81b7ab56 100644
--- a/status.c
+++ b/status.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/system.c b/system.c
index f5674fd40..c5f0825f6 100644
--- a/system.c
+++ b/system.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/thread.c b/thread.c
index 814f895ea..c2acbfaf0 100644
--- a/thread.c
+++ b/thread.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 #if HAVE_CONFIG_H
diff --git a/url.c b/url.c
index 6abe2faf2..bf8618464 100644
--- a/url.c
+++ b/url.c
@@ -13,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  */ 
 
 /*