Update FSF's address.

276 files changed, 531 insertions, 531 deletions

diff --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index cecfcb3909d..234c6653b92 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -18,8 +18,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 16d50f10535..d5016ea8cc8 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -82,7 +82,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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
 
 \endgroup}
 
diff --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index a77d84c114a..768224eb829 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -37,8 +37,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % Czech hyphenation rules applied
 \chyph
diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index 892c0575848..7ac0e2a862b 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -23,8 +23,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index 52d3f3eaad2..8b9fc56873a 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -15,8 +15,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index 07f18dfb8f9..e5bd326038f 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -20,7 +20,7 @@ PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 GNU Emacs; see the file COPYING.  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.
 
 ============================================================================
 
diff --git a/etc/emacs.1 b/etc/emacs.1
index 8605a0e7b90..95617414e7e 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -14,8 +14,8 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with GNU Emacs; see the file COPYING.  If not, write to the
-.\" Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-.\" Boston, MA 02111-1307, USA.
+.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+.\" Boston, MA 02110-1301, USA.
 .\"
 '\" t
 .TH EMACS 1 "2001 November 23"
diff --git a/etc/emacs.py b/etc/emacs.py
index d672dbf63cb..f644db2d8b4 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os, sys, traceback, inspect, rlcompleter, __main__
 
diff --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index 922ce65f622..931d1ead7be 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -16,8 +16,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index a479c57f544..cda6f3f17d3 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -71,7 +71,7 @@ la note de copyright et cette note de permission soient conserv\'ees sur
 toutes les copies.
 
 Pour les copies du manuel GNU Emacs, \'ecrivez \`a la 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
 
 \endgroup}
 
diff --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index 06422fe77ae..912a0977093 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -38,8 +38,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
diff --git a/etc/gfdl.1 b/etc/gfdl.1
index 63e1d7a4e33..0974486ed63 100644
--- a/etc/gfdl.1
+++ b/etc/gfdl.1
@@ -12,7 +12,7 @@ Copyright
 .if t \(co
 .if n (c)
 2000  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.
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index a76b591dbf1..16800048c31 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -43,8 +43,8 @@ heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 From lars Thu Feb 23 23:20:38 1995
 From: larsi@ifi.uio.no (ding)
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 77aa5ade836..27131a001ca 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -32,8 +32,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index 713eaba7a80..5bfea15a8ab 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -92,7 +92,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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
 
 \endgroup}
 
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index d7d5200182a..952c31d2b2e 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -17,8 +17,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to the
-% Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index dd922b9338d..118133ba73b 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -17,8 +17,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to the
-% Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
diff --git a/etc/refcard.tex b/etc/refcard.tex
index 3b56122a24e..520e3f37b8c 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -80,7 +80,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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
 
 \endgroup}
 
diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex
index 608eff79967..d62eedd17bb 100644
--- a/etc/ru-refcard.tex
+++ b/etc/ru-refcard.tex
@@ -35,7 +35,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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
 
 \endgroup}
 
diff --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index 59ed9e9f531..32321e05277 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -18,8 +18,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index d65f81619e7..73fd7c1f598 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -84,7 +84,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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
 
 \endgroup}
 
diff --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index 77801c81383..ff94cc43706 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -37,8 +37,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % Slovak hyphenation rules applied
 \shyph
diff --git a/etc/survival.tex b/etc/survival.tex
index e30d14f8d74..2c5ada3c160 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -41,8 +41,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
 \def\year{2000}
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index 7ec8165887e..5591f151f95 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -73,7 +73,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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.
 
 \endgroup}
 
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index 868be3d2f19..e5e0bded891 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -81,7 +81,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, 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.
 
 \endgroup}
 
diff --git a/leim/MISC-DIC/CTLau-b5.html b/leim/MISC-DIC/CTLau-b5.html
index 2162c2f04ae..56994dd71e3 100644
--- a/leim/MISC-DIC/CTLau-b5.html
+++ b/leim/MISC-DIC/CTLau-b5.html
@@ -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-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 #
 # File Format:
diff --git a/leim/MISC-DIC/CTLau.html b/leim/MISC-DIC/CTLau.html
index 2a8ca5857f3..77db00d26be 100644
--- a/leim/MISC-DIC/CTLau.html
+++ b/leim/MISC-DIC/CTLau.html
@@ -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-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # 
 #
 # File Format:
diff --git a/leim/Makefile.in b/leim/Makefile.in
index acffcc7f7b5..7d550fa7598 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -21,8 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index c15bfaa09e0..6d7b949d8d0 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 8e0d8c3909c..a311990ec3a 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 srcdir=.
 
diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el
index c6b440676f2..6e82d7b3ca3 100644
--- a/leim/quail/croatian.el
+++ b/leim/quail/croatian.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index ef35ce50c4e..aa40624ffd7 100644
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 82d113be5a2..91b2312dda5 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/czech.el b/leim/quail/czech.el
index 04d94d12b6e..e387814d0df 100644
--- a/leim/quail/czech.el
+++ b/leim/quail/czech.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 83d4a94cf48..0930f1d05d8 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
diff --git a/leim/quail/georgian.el b/leim/quail/georgian.el
index 9a08ff5ef42..a95511d3569 100644
--- a/leim/quail/georgian.el
+++ b/leim/quail/georgian.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 1b269307950..cd6e1560d7d 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index 4d1b10e28b0..ee76c4e9af9 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hangul3.el b/leim/quail/hangul3.el
index f4d31c47017..9931706c4a4 100644
--- a/leim/quail/hangul3.el
+++ b/leim/quail/hangul3.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hanja-jis.el b/leim/quail/hanja-jis.el
index 1a55fbb0a6d..59ca777769b 100644
--- a/leim/quail/hanja-jis.el
+++ b/leim/quail/hanja-jis.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hanja.el b/leim/quail/hanja.el
index c010a27d1b3..27cc557f9f6 100644
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index 8cf2ea4a55f..230248b9bec 100644
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/hebrew.el b/leim/quail/hebrew.el
index e44724e1eb4..eadabcb1df7 100644
--- a/leim/quail/hebrew.el
+++ b/leim/quail/hebrew.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index 972a54263ac..8e42ae7c3a7 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 759393b0776..32547793005 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/japanese.el b/leim/quail/japanese.el
index 5713ef75c9e..fa87a9935b9 100644
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/lao.el b/leim/quail/lao.el
index c5f66bba813..e28bc5fc1fc 100644
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.el
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index d9bf7ce183e..e77c729cca3 100644
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index 4b75135e79b..0284810b8eb 100644
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index 996497c5a0b..147dce53e3b 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index 171e835106c..0321c953f1c 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index 2a6784abc61..e1ea6ed8d87 100644
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index 53dc296713c..a75b453bdcb 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/pypunct-b5.el b/leim/quail/pypunct-b5.el
index d8e215e58af..1d9a6937bb5 100644
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/rfc1345.el b/leim/quail/rfc1345.el
index 87c62b2c65d..de96b32d6e8 100644
--- a/leim/quail/rfc1345.el
+++ b/leim/quail/rfc1345.el
diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index d41af8dbc9f..a962e9b7571 100644
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index 372f953e8d8..680f4ef593d 100644
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index f1146e3f28f..c27d8be1102 100644
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; 94.10.24   Written for Mule Ver.2.0 (koaunghi.un@zdv.uni-tuebingen.de)
 ;;; 94.11.04   Updated for Mule Ver.2.1 (koaunghi.un@zdv.uni-tuebingen.de)
diff --git a/leim/quail/thai.el b/leim/quail/thai.el
index dbef1b3d899..d6d40991c15 100644
--- a/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 6408eb13cc4..a44b818f0c8 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/viqr.el b/leim/quail/viqr.el
index 95078394a99..a5181528639 100644
--- a/leim/quail/viqr.el
+++ b/leim/quail/viqr.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index 0447b199959..7cd0ed438c1 100644
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/leim/quail/welsh.el b/leim/quail/welsh.el
index 606caf4fc30..3ced894f897 100644
--- a/leim/quail/welsh.el
+++ b/leim/quail/welsh.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1d8c5e6c9ba..372983221a3 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -16,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 38eb96e076f..225c272587f 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 # USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
@@ -30,7 +30,7 @@ use Mail::Address;
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.5 $';
+my($version) = '$Revision$';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 8992b3f9e80..4dd6bb20a68 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -14,8 +14,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 09878543d44..9db4a190803 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    See also sorted-doc.c, which produces similar output
    but in texinfo format and sorted by function/variable name.  */
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 4ad45d195f6..bc323fbbbd8 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 90c0228f720..75fa9ebe8e7 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define NO_SHORTNAMES
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f9185c21c08..f0e9ad8c1f6 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  * For Emacs in SunView/Sun-Windows: (supported by Sun Unix v3.2 or greater)
diff --git a/lib-src/etags.c b/lib-src/etags.c
index a06d29bfd11..2f273771a96 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -16,7 +16,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 /*
  * Authors:
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index cee7eaa130e..cf6c1ff334d 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #define NO_SHORTNAMES
 #define _XOPEN_SOURCE 500	/* for cuserid */
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index a4b0a65147d..6799045bde8 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
diff --git a/lib-src/getopt.h b/lib-src/getopt.h
index 0d4c40c52d0..953a7d15252 100644
--- a/lib-src/getopt.h
+++ b/lib-src/getopt.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GETOPT_H
 
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index f08cd72638a..4ec1e50b830 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 38fce879c7a..04468535e02 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 
 # Extract entries from ChangeLogs matching specified criteria.
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7a2f127ae61..05e0658e566 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index dafd8f8914c..6c0816ed98a 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The arguments given to this program are all the C and Lisp source files
  of GNU Emacs.  .elc and .el and .c files are allowed.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index fbb5559fd80..d8e8c205b3b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -15,8 +15,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 #
 
 ALL	      = make-docfile hexl ctags etags movemail ebrowse
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e4243a1bd66..f82bebd4f2b 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
    cause loss of mail* if you do it on a system that does not normally
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 261a6b41614..c346ccd908b 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd9cae9796..b1cb97dabda 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
 */
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index adf80c544b6..9a85ba3746c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES	/* Tell config not to load remap.h */
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 8954e1d5369..5267ec97eb4 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <stdio.h>
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 8d924532b87..7bc7186c259 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /**
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 365050e9584..2a7de0f2f11 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Arguments which are detectably either RCS masters (with names ending in ,v)
 # or Emacs version files  (with names of the form foo.~<number>~) are ignored.
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 19f5a2b26b4..05864c2ad26 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -52,7 +52,7 @@ Options:
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.53 2004/02/15 07:41:58 uid65632 Exp $'
+Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
 # 2004 Free Software Foundation, Inc.
@@ -69,8 +69,8 @@ Id='$Id: rcs2log,v 1.53 2004/02/15 07:41:58 uid65632 Exp $'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 Copyright='Copyright (C) 2004 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 3af3276e811..120a510f006 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    This version sorts the output by function name.  */
 
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 0333bd7d710..0bbc6806d71 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 8f7c90cad55..d9d20b8525d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This program is allows a game to securely and atomically update a
    score file.  It should be installed setuid, owned by an appropriate
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 9c513ac8200..8e1722d43ba 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -20,8 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 
 DIFF="diff"
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 88ac4975010..c1ee2ab80eb 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -16,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 SHELL = @SHELL@
 
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index cb2396975dc..bd4df97562e 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -192,8 +192,8 @@ Published by the:@*
 GNU Press,                      @hfill  @uref{http://www.gnupress.org}@*
 a division of the               @hfill General: @email{press@@gnu.org}@*
 Free Software Foundation, Inc.  @hfill Orders:@w{ }  @email{sales@@gnu.org}@*
-59 Temple Place, Suite 330      @hfill Tel: +1 (617) 542-5942@*
-Boston, MA 02111-1307 USA       @hfill Fax: +1 (617) 542-2652@*
+51 Franklin Street, Fifth Floor @hfill Tel: +1 (617) 542-5942@*
+Boston, MA 02110-1301 USA       @hfill Fax: +1 (617) 542-2652@*
 @end iftex
 
 @ifnottex
@@ -203,8 +203,8 @@ Published by the:
 GNU Press,                          Website: http://www.gnupress.org
 a division of the                   General: press@@gnu.org
 Free Software Foundation, Inc.      Orders:  sales@@gnu.org
-59 Temple Place, Suite 330          Tel: +1 (617) 542-5942
-Boston, MA 02111-1307 USA           Fax: +1 (617) 542-2652
+51 Franklin Street, Fifth Floor     Tel: +1 (617) 542-5942
+Boston, MA 02110-1301 USA           Fax: +1 (617) 542-2652
 @end example
 @end ifnottex
 
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index 87a8597ccad..2131542a110 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -16,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 srcdir = .
 
diff --git a/lispintro/texinfo.tex b/lispintro/texinfo.tex
index af648f19e17..e960fb32992 100644
--- a/lispintro/texinfo.tex
+++ b/lispintro/texinfo.tex
@@ -20,8 +20,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 %
 % In other words, you are welcome to use, share and improve this program.
 % You are forbidden to forbid anyone else to use, share and improve
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index f2e5e46874f..4fac4c025b0 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = @srcdir@
diff --git a/lispref/doclicense.texi b/lispref/doclicense.texi
index 1c7a4d05989..39ece6afdf0 100644
--- a/lispref/doclicense.texi
+++ b/lispref/doclicense.texi
@@ -6,7 +6,7 @@
 
 @display
 Copyright (C) 2000  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.
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 0865aa8df58..457f98c1104 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = .
diff --git a/lispref/tindex.pl b/lispref/tindex.pl
index 04eacb2e999..f3372bf21ee 100755
--- a/lispref/tindex.pl
+++ b/lispref/tindex.pl
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 require 5;
 use Getopt::Long;
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 8ec755f54b1..df765d27e12 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -425,8 +425,8 @@ Use a message like this one:
 
 ;; You should have received a copy of the GNU General Public
 ;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
 @end smallexample
 
 If you have signed papers to assign the copyright to the Foundation,
diff --git a/lispref/vol1.texi b/lispref/vol1.texi
index 58ab99c91ba..1e2b0da728a 100644
--- a/lispref/vol1.texi
+++ b/lispref/vol1.texi
@@ -134,8 +134,8 @@ Manual.  It corresponds to Emacs Version 19.29.
 @c than the foobar edition").  --mew 13sep93
 
 Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA  02110-1301 USA
 @end ifinfo
 
 @setchapternewpage odd
diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index d7a67315c52..f58deb3948f 100644
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -135,8 +135,8 @@ Manual.  It corresponds to Emacs Version 19.29.
 @c than the foobar edition").  --mew 13sep93
 
 Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA  02110-1301 USA
 @end ifinfo
 
 @setchapternewpage odd
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index b0f3f6abce8..1369ed26f72 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 248e4e8be74..e5d9ebbd0f3 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 8a68cbe30f6..02a2f035aa3 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index 62396d1f3d4..c5a1fbe9155 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef LWLIB_XM_H
 #define LWLIB_XM_H
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 1980a8261c7..df9cba52f63 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 525bb9bde0d..39b9400c5c8 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef NeXT
 #undef __STRICT_BSD__ /* ick */
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 3fab2e80dbe..09d11c8b683 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Created by devin@lucid.com */
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 5ba052f1285..e896617a69e 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 695535e1049..a25307b6ff3 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 4ac6a9d61f0..6cd2f52bbba 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 5e1b3a66603..c29e2a743f3 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 96027388e3f..dc9b8ed495f 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index 9c60d5ca2ce..c9db51282c0 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _GRP_H
 #define _GRP_H
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 356a557c5fa..37ce77cea30 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index b5eba307824..ee77176e2af 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 149d465f59f..ab8dbcdad89 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index 0566b63cd58..1b0a0314539 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index 36a921f2a1e..2682dd45438 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index a0e3c6d6f26..b1669947bf9 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index b72385c1b4d..c1c9f4a7842 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index 4ae305cf026..76b5e3acbc4 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 0d647d16c9e..7055a7a5d0d 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 3996351a79a..be5b0243e2f 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index a6ce81af1ee..dbe9544aca1 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index e1fe3217ea6..27cfbe4dcaa 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/make-package b/mac/make-package
index d9186605386..e8bf66aaaa8 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -34,8 +34,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 # Contributed by Steven Tamm (steventamm@mac.com).
 
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 76217d24101..a216064516f 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  */
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.  */
 #
 # Defines the following targets:
 #   Emacs (default) - normal Carbon Emacs build.
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 804e55f700b..a36249a42a2 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 7db45ca4f80..133ba1a030e 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index a982e941f98..cf7ac5f0375 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
diff --git a/man/Makefile.in b/man/Makefile.in
index 03c664190f5..b8da48143bf 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Where to find the source code.  $(srcdir) will be the man
 # subdirectory of the source tree.  This is
diff --git a/man/calc.texi b/man/calc.texi
index 948b6049198..7aa55d26a96 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -187,7 +187,7 @@ longer Info tutorial.)
 
 @display
 Copyright @copyright{} 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.
diff --git a/man/doclicense.texi b/man/doclicense.texi
index 361389cbca9..e74499daf06 100644
--- a/man/doclicense.texi
+++ b/man/doclicense.texi
@@ -5,7 +5,7 @@
 
 @display
 Copyright (C) 2000  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.
diff --git a/man/faq.texi b/man/faq.texi
index 641f1f5b307..bccc23e181c 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -518,8 +518,8 @@ gnu@@gnu.org
 
 @item Postal address
 Free Software Foundation@*
-59 Temple Place - Suite 330@*
-Boston, MA 02111-1307@*
+51 Franklin Street, Fifth Floor@*
+Boston, MA 02110-1301@*
 USA@*
 
 @end table
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 9771be8ef06..ec14ae3abe3 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in $(srcdir)/src, and the source code for Emacs's
diff --git a/man/mh-e.texi b/man/mh-e.texi
index c998debb16b..8e48f32cb81 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -3540,7 +3540,7 @@ Stephen Gildea, June 1994
 
 @display
 Copyright @copyright{} 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.
diff --git a/man/texinfo.tex b/man/texinfo.tex
index 15e2ac309ca..ef68971341a 100644
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -20,8 +20,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 %
 % In other words, you are welcome to use, share and improve this program.
 % You are forbidden to forbid anyone else to use, share and improve
diff --git a/man/trouble.texi b/man/trouble.texi
index da14f25568f..e7534ed2560 100644
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -595,8 +595,8 @@ or machine-readable media to this address:
 @format
 GNU Emacs Bugs
 Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301 USA
 @end format
 
   We do not promise to fix the bug; but if the bug is serious,
diff --git a/nt/addpm.c b/nt/addpm.c
index ccae76c1f20..398737839c9 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /****************************************************************************
  *
diff --git a/nt/addsection.c b/nt/addsection.c
index 8fbe8c38050..20ab5cf5163 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Andrew Innes <andrewi@harlequin.co.uk>       04-Jan-1999
      based on code from unexw32.c
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 52760402f1b..58be32984a9 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -26,8 +26,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <windows.h>
 
diff --git a/nt/config.nt b/nt/config.nt
index a41d6ecac4b..ac59faa211c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* No code in Emacs #includes config.h twice, but some of the code
diff --git a/nt/configure.bat b/nt/configure.bat
index 8433cacc317..6a44a3b82c4 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -18,8 +18,8 @@ rem   GNU General Public License for more details.
 

 rem   You should have received a copy of the GNU General Public License

 rem   along with GNU Emacs; see the file COPYING.  If not, write to the

-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-rem   Boston, MA 02111-1307, USA.

+rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+rem   Boston, MA 02110-1301, USA.

 rem   ----------------------------------------------------------------------

 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:

 rem

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 712c28f1c32..6661e84f244 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <windows.h>
 #include <ddeml.h>
diff --git a/nt/envadd.bat b/nt/envadd.bat
index ec9326a56c9..3e9a49ef292 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -17,8 +17,8 @@ rem  GNU General Public License for more details.
 rem

 rem  You should have received a copy of the GNU General Public License

 rem  along with GNU Emacs; see the file COPYING.  If not, write to

-rem  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-rem  Boston, MA 02111-1307, USA.

+rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+rem  Boston, MA 02110-1301, USA.

 rem

 rem

 rem  Usage:

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 23d3dac3719..e077aef5024 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -13,8 +13,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 
 # Ensure 'all' is the default target
 all:
diff --git a/nt/inc/gettext.h b/nt/inc/gettext.h
index 148da8b36d0..cd251314cb4 100755
--- a/nt/inc/gettext.h
+++ b/nt/inc/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 02110-1301,
    USA.  */
 
 #ifndef _LIBGETTEXT_H
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index b0cac8b10e6..b44cbe543fd 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _GRP_H
 #define _GRP_H
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index d3936da2a4d..228eefb2396 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -14,8 +14,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Workable version of <sys/socket.h> based on winsock.h */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index ec30853ed29..5d793751f56 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -17,8 +17,8 @@
 #

 #  You should have received a copy of the GNU General Public License

 #  along with GNU Emacs; see the file COPYING.  If not, write to

-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-#  Boston, MA 02111-1307, USA.

+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+#  Boston, MA 02110-1301, USA.

 

 ALL		= addpm ddeclient runemacs cmdproxy addsection preprep

 

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index c252dfb4a85..ea318af8405 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -19,8 +19,8 @@ rem  GNU General Public License for more details.
 rem

 rem  You should have received a copy of the GNU General Public License

 rem  along with GNU Emacs; see the file COPYING.  If not, write to

-rem  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-rem  Boston, MA 02111-1307, USA.

+rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+rem  Boston, MA 02110-1301, USA.

 rem

 rem

 rem  Usage:

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 89bf9ac91fc..1876dffa59f 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -13,8 +13,8 @@
 #

 #  You should have received a copy of the GNU General Public License

 #  along with GNU Emacs; see the file COPYING.  If not, write to

-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-#  Boston, MA 02111-1307, USA.

+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+#  Boston, MA 02110-1301, USA.

 

 # Ensure 'all' is the default target

 all:

diff --git a/nt/paths.h b/nt/paths.h
index 1e509530768..5c1c4bfd332 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The default search path for Lisp function "load".
diff --git a/nt/preprep.c b/nt/preprep.c
index dfc6c7e6fa1..21cc92e305b 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Andrew Innes <andrewi@harlequin.co.uk>       16-Jan-1999
      based on code from addsection.c
diff --git a/src/m/7300.h b/src/m/7300.h
index 17dde0c9180..fa95b3d9c4e 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 6f0a77be44c..66978329d75 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index 213af43266b..cf0afd90bb5 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/alliant.h b/src/m/alliant.h
index c9c1c70cc95..a32e514271d 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3e1d378b292..aff6182270f 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/altos.h b/src/m/altos.h
index b71d006f241..e3cf0898773 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 37cb8c0d362..8b32a2e64d1 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
 This file for amdahl_uts created by modifying the template.h
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0192afc9d45..61b18dcc319 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/apollo.h b/src/m/apollo.h
index e28ffef3379..8fa91c004c5 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/arm.h b/src/m/arm.h
index d3a95521e79..1ebcf3be4a4 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 559ac2f3c6c..949e6b1d01b 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 7705ef645fb..13a262423b0 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 55beedb7c41..0b0bb020122 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/clipper.h b/src/m/clipper.h
index dc4dd0c2df8..5da09e02fb8 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index d44eff6700c..cb344f98f7f 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/convex.h b/src/m/convex.h
index a871d4ac214..97b291743dc 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 12b757305ba..e2813dc2a4b 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 89889824fd1..ab0a48a4e31 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 1a2b99cdffc..7a24c3940d3 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/dual.h b/src/m/dual.h
index 392cb64eb49..253c12bec52 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 1795d9815d3..f8de3609690 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index b782542348c..dcb46bf83d8 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #undef LIB_STANDARD
 #undef C_DEBUG_SWITCH
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 145d682afb1..4a267865085 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/gould.h b/src/m/gould.h
index eeac2aef2f6..3a382ca0c1b 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -21,8 +21,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 8f08ed3b617..64243f4be31 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 24c9a521d0c..8886aec204c 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/i860.h b/src/m/i860.h
index 9d56b886f62..66ca2b8fa66 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 947bb9d4562..33d843c773f 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #define BITS_PER_LONG		64
 #define BITS_PER_EMACS_INT	64
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 3fb228afa18..b958656c3e4 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "ibmps2-aix.h"
 
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index eb843ffe71b..d2202d65472 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 5be14b04884..b76d03bc0b7 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 8bce9fb6f69..b9ea0e6208f 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 9c262640570..1388a46b001 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 8797a49d307..af7fbb8dfbf 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/intel386.h b/src/m/intel386.h
index e240beb91a3..c63dae7af0b 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 8d3b7a883bd..a13a6f8c2ff 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/irist.h b/src/m/irist.h
index d2b9dd28314..71726977b23 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index ef481e13f2b..9b35f03ea70 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/m68k.h b/src/m/m68k.h
index ce7b268bbec..9fdcf1511b8 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following three symbols give information on
diff --git a/src/m/macppc.h b/src/m/macppc.h
index c068fca32a9..36022af3e52 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 34ea78696c1..4582e29b6bd 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/mega68.h b/src/m/mega68.h
index e86a5048680..ba7ee6b48d4 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 5a6250c3c31..47d34f43768 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 11b1f971d27..f00790210c9 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -20,8 +20,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/mips.h b/src/m/mips.h
index cca45868178..e868423642c 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/news.h b/src/m/news.h
index 1a594ad82a7..1d2585c09a0 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/next.h b/src/m/next.h
index 1e8a3d3a31c..2f2952e10f4 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Say this machine is a next if not previously defined */
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index d6c09bd65b5..7be5c5dc7db 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 70804ef2c36..3d8794b2802 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 549f648c7f8..07fff86502b 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 214954b631a..9a135fe2d9f 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
diff --git a/src/m/nu.h b/src/m/nu.h
index 44abc929053..8ca03155314 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/orion.h b/src/m/orion.h
index 76519f6fe68..e4fa8529664 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/orion105.h b/src/m/orion105.h
index c58f9222068..d0adaba70ec 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index c6762a93120..be430d25fdc 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/plexus.h b/src/m/plexus.h
index b7012c750d6..a2f6cc545a0 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/powermac.h b/src/m/powermac.h
index dc698675eaa..c41003ae61c 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 7ba6a9e058e..7e0db61ec59 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index a72c7055780..57d255a861e 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sequent.h b/src/m/sequent.h
index 7e45c4f4fda..7c572f54f68 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8656152fb7a..6926aced07b 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/sps7.h b/src/m/sps7.h
index ba4eae18510..3bd0c94bccd 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 088ea23d94c..83dbf4941ff 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/stride.h b/src/m/stride.h
index 941b9d7cc98..f176a7642a7 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 54d51106e6b..7ab81218705 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 33f811aea04..452fdfc7c01 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/sun386.h b/src/m/sun386.h
index d3866e8f177..782e10925ef 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index ca584c9c6e1..262d6474757 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988]
  * Modified the sequent.h file for the Sequent Symmetry machine.
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 084e432223e..4c904aaf569 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 42741e25cb6..988624839b4 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/targon31.h b/src/m/targon31.h
index afc72f4e0ee..08ecb681bd9 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 34b160ba6da..164df72210a 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index a30bbdd8d6c..7af3dab6a07 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/template.h b/src/m/template.h
index 914daa3047c..c088efff81a 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 947e495aa20..c5f34d065ea 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index fbd7e032a38..927dfca93d9 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
diff --git a/src/m/ustation.h b/src/m/ustation.h
index b03a3555352..e7068f3cd86 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/vax.h b/src/m/vax.h
index 2e9d4738b64..22fda95abc5 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/wicat.h b/src/m/wicat.h
index bca10df352d..bd8fcefe99c 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 701e6e21e1b..39c7baa9de6 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 617b0a9c1d7..c6e54710bd6 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index b96bf4373b3..8fe7bd8fa24 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 624f7090f80..7316841e212 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index e39a8c81948..386ab1bbbe5 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index f5db6fbb5cd..bbb2715bdf7 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/cxux.h b/src/s/cxux.h
index fd8b00ff2b4..2af6d006095 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 38e346ac510..0094ef793dc 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 970e954b616..fea5b4c282d 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 4c4a84d9996..fb01b539f27 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index 3d4c4775c91..a95420595a1 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5
    compiler.  You must upgraded to at least gcc-2.5.8.  If you are
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index 7121f5e18a3..c2c7461a204 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "dgux.h"
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index dbd08f5b3be..dc26eb9f399 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Get the correct __FreeBSD_version, even if this is before that was
    defined. */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3cf21756d7d..2563496af5c 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file was put together by Michael K. Johnson and Rik Faith.  */
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index f7fb4899db9..79e5a88a7b9 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Get most of the stuff from bsd4.3 */
diff --git a/src/s/hpux.h b/src/s/hpux.h
index debf6aad6d3..665b1f3063d 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 51391d56e9d..8815bb56f39 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 50d0962e48f..64187428c29 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index fad50aa20f8..60dd6d49c79 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 017e1892c10..55de8cba6f9 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* LynxOS is almost a bsd 4.2 system */
 #include "s/bsd4-2.h"
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 10e3bfe3a5a..c4697db34db 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *      Define symbols to identify the version of Unix this is.
diff --git a/src/s/msdos.h b/src/s/msdos.h
index cef2184a37b..5a0cbba5959 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index f4ab0597eee..c674bfc559d 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Use the SysVr4 file for at least base configuration. */
 
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 36549e88bfa..9253e6acffc 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "bsd4-3.h"
 
diff --git a/src/s/ptx.h b/src/s/ptx.h
index dab0f0f205f..e490ba659a2 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file was written by Bill Burton <billb@progress.com>.  Parts were
    adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 15092f59add..ccfa5704b85 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define  RISCiX_1_1	1
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index 988fbd61ba0..b0e00e780cc 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define  RISCiX_1_2	1
diff --git a/src/s/rtu.h b/src/s/rtu.h
index afe63b5efcc..92afbaf6328 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/sco4.h b/src/s/sco4.h
index b39c7a75459..757eb0b57b0 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Ian Lance Taylor, ian@cygnus.com.  */
 
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 096944b833d..e490a91b608 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Mark Diekhans <markd@grizzly.com>.  */
 
diff --git a/src/s/template.h b/src/s/template.h
index e969c72e0aa..5ef1049164d 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/umax.h b/src/s/umax.h
index 36f5499a4b3..1741b1d04e3 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0a395b22a09..05d162239a8 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index ecce9d92c76..21b469dcd55 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index a360fd64d7a..dff90efb225 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 375dba75f56..0da477276fd 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index de1a20d2658..285bae670df 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 719b8c389a3..4edda95b39c 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file written by James Van Artsdalen of Dell Computer Corporation.
  * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
diff --git a/src/s/vms.h b/src/s/vms.h
index 1338cdb5718..9afd69b8539 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
diff --git a/src/s/xenix.h b/src/s/xenix.h
index c0840bcd3b3..763a10956ff 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index 643fe91dfda..6b24bec9a77 100644
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary: