changeset 64083:23a17af379b1

Update FSF's address.
author Lute Kamstra <lute@gnu.org>
date Mon, 04 Jul 2005 15:47:28 +0000
parents e9ecdd073be3
children a8fa7c632ee4
files etc/cs-dired-ref.tex etc/cs-refcard.tex etc/cs-survival.tex etc/de-refcard.tex etc/dired-ref.tex etc/edt-user.doc etc/emacs.1 etc/emacs.py etc/fr-drdref.tex etc/fr-refcard.tex etc/fr-survival.tex etc/gfdl.1 etc/gnus-tut.txt etc/orgcard.tex etc/pl-refcard.tex etc/ps-prin0.ps etc/ps-prin1.ps etc/refcard.tex etc/ru-refcard.tex etc/sk-dired-ref.tex etc/sk-refcard.tex etc/sk-survival.tex etc/survival.tex etc/vipcard.tex etc/viperCard.tex leim/MISC-DIC/CTLau-b5.html leim/MISC-DIC/CTLau.html leim/Makefile.in leim/leim-ext.el leim/makefile.w32-in leim/quail/croatian.el leim/quail/cyril-jis.el leim/quail/cyrillic.el leim/quail/czech.el leim/quail/ethiopic.el leim/quail/georgian.el leim/quail/greek.el leim/quail/hangul.el leim/quail/hangul3.el leim/quail/hanja-jis.el leim/quail/hanja.el leim/quail/hanja3.el leim/quail/hebrew.el leim/quail/indian.el leim/quail/ipa.el leim/quail/japanese.el leim/quail/lao.el leim/quail/latin-alt.el leim/quail/latin-ltx.el leim/quail/latin-post.el leim/quail/latin-pre.el leim/quail/lrt.el leim/quail/py-punct.el leim/quail/pypunct-b5.el leim/quail/rfc1345.el leim/quail/sgml-input.el leim/quail/slovak.el leim/quail/symbol-ksc.el leim/quail/thai.el leim/quail/uni-input.el leim/quail/viqr.el leim/quail/vntelex.el leim/quail/welsh.el lib-src/Makefile.in lib-src/b2m.pl lib-src/cvtmail.c lib-src/digest-doc.c lib-src/ebrowse.c lib-src/emacsclient.c lib-src/emacstool.c lib-src/etags.c lib-src/fakemail.c lib-src/getopt.c lib-src/getopt.h lib-src/getopt1.c lib-src/grep-changelog lib-src/hexl.c lib-src/make-docfile.c lib-src/makefile.w32-in lib-src/movemail.c lib-src/ntlib.c lib-src/ntlib.h lib-src/pop.c lib-src/pop.h lib-src/profile.c lib-src/rcs-checkin lib-src/rcs2log lib-src/sorted-doc.c lib-src/test-distrib.c lib-src/update-game-score.c lib-src/vcdiff lispintro/Makefile.in lispintro/emacs-lisp-intro.texi lispintro/makefile.w32-in lispintro/texinfo.tex lispref/Makefile.in lispref/doclicense.texi lispref/makefile.w32-in lispref/tindex.pl lispref/tips.texi lispref/vol1.texi lispref/vol2.texi lwlib/lwlib-Xaw.c lwlib/lwlib-Xlw.c lwlib/lwlib-Xm.c lwlib/lwlib-Xm.h lwlib/lwlib-utils.c lwlib/lwlib.c lwlib/xlwmenu.c lwlib/xlwmenu.h lwlib/xlwmenuP.h mac/inc/config.h mac/inc/dirent.h mac/inc/epaths.h mac/inc/grp.h mac/inc/m-mac.h mac/inc/pwd.h mac/inc/s-mac.h mac/inc/sys/file.h mac/inc/sys/ioctl.h mac/inc/sys/param.h mac/inc/sys/stat.h mac/inc/sys/time.h mac/inc/sys/types.h mac/inc/termio.h mac/inc/utime.h mac/inc/utsname.h mac/make-package mac/makefile.MPW mac/src/Emacs.r mac/src/EmacsMPW.r mac/src/chdir.c man/Makefile.in man/calc.texi man/doclicense.texi man/faq.texi man/makefile.w32-in man/mh-e.texi man/texinfo.tex man/trouble.texi nt/addpm.c nt/addsection.c nt/cmdproxy.c nt/config.nt nt/configure.bat nt/ddeclient.c nt/envadd.bat nt/gmake.defs nt/inc/gettext.h nt/inc/grp.h nt/inc/sys/socket.h nt/makefile.w32-in nt/multi-install-info.bat nt/nmake.defs nt/paths.h nt/preprep.c src/m/7300.h src/m/acorn.h src/m/alliant-2800.h src/m/alliant.h src/m/alpha.h src/m/altos.h src/m/amdahl.h src/m/amdx86-64.h src/m/apollo.h src/m/arm.h src/m/att3b.h src/m/aviion.h src/m/celerity.h src/m/clipper.h src/m/cnvrgnt.h src/m/convex.h src/m/cydra5.h src/m/delta88k.h src/m/dpx2.h src/m/dual.h src/m/elxsi.h src/m/ews4800.h src/m/gould-np1.h src/m/gould.h src/m/hp800.h src/m/hp9000s300.h src/m/i860.h src/m/ia64.h src/m/ibm370aix.h src/m/ibmps2-aix.h src/m/ibmrs6000.h src/m/ibmrt-aix.h src/m/ibmrt.h src/m/ibms390.h src/m/intel386.h src/m/iris4d.h src/m/irist.h src/m/isi-ov.h src/m/m68k.h src/m/macppc.h src/m/masscomp.h src/m/mega68.h src/m/mg1.h src/m/mips-siemens.h src/m/mips.h src/m/news.h src/m/next.h src/m/nh3000.h src/m/nh4000.h src/m/ns16000.h src/m/ns32000.h src/m/nu.h src/m/orion.h src/m/orion105.h src/m/pfa50.h src/m/plexus.h src/m/powermac.h src/m/pyramid.h src/m/sequent-ptx.h src/m/sequent.h src/m/sparc.h src/m/sps7.h src/m/sr2k.h src/m/stride.h src/m/sun1.h src/m/sun2.h src/m/sun386.h src/m/symmetry.h src/m/tad68k.h src/m/tahoe.h src/m/targon31.h src/m/tek4300.h src/m/tekxd88.h src/m/template.h src/m/tower32.h src/m/tower32v3.h src/m/ustation.h src/m/vax.h src/m/wicat.h src/m/windowsnt.h src/m/xps100.h src/s/aix3-1.h src/s/bsd4-1.h src/s/bsd4-2.h src/s/bsd4-3.h src/s/cxux.h src/s/cygwin.h src/s/darwin.h src/s/dgux.h src/s/dgux5-4-3.h src/s/dgux5-4r2.h src/s/freebsd.h src/s/gnu-linux.h src/s/gnu.h src/s/hpux.h src/s/iris3-5.h src/s/iris3-6.h src/s/irix3-3.h src/s/lynxos.h src/s/ms-w32.h src/s/msdos.h src/s/newsos5.h src/s/nextstep.h src/s/ptx.h src/s/riscix1-1.h src/s/riscix12.h src/s/rtu.h src/s/sco4.h src/s/sco5.h src/s/template.h src/s/umax.h src/s/unipl5-2.h src/s/usg5-0.h src/s/usg5-2-2.h src/s/usg5-2.h src/s/usg5-3.h src/s/usg5-4.h src/s/vms.h src/s/xenix.h vms/make-mms-derivative.el
diffstat 276 files changed, 531 insertions(+), 531 deletions(-) [+]
line wrap: on
line diff
--- a/etc/cs-dired-ref.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/cs-dired-ref.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/etc/cs-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/cs-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -82,7 +82,7 @@
 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}
 
--- a/etc/cs-survival.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/cs-survival.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/etc/de-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/de-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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).
 %
--- a/etc/dired-ref.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/dired-ref.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/etc/edt-user.doc	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/edt-user.doc	Mon Jul 04 15:47:28 2005 +0000
@@ -20,7 +20,7 @@
 
 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.
 
 ============================================================================
 
--- a/etc/emacs.1	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/emacs.1	Mon Jul 04 15:47:28 2005 +0000
@@ -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"
--- a/etc/emacs.py	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/emacs.py	Mon Jul 04 15:47:28 2005 +0000
@@ -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__
 
--- a/etc/fr-drdref.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/fr-drdref.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/etc/fr-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/fr-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -71,7 +71,7 @@
 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}
 
--- a/etc/fr-survival.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/fr-survival.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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
 
--- a/etc/gfdl.1	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/gfdl.1	Mon Jul 04 15:47:28 2005 +0000
@@ -12,7 +12,7 @@
 .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.
--- a/etc/gnus-tut.txt	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/gnus-tut.txt	Mon Jul 04 15:47:28 2005 +0000
@@ -43,8 +43,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.
 
 From lars Thu Feb 23 23:20:38 1995
 From: larsi@ifi.uio.no (ding)
--- a/etc/orgcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/orgcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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).
 %
--- a/etc/pl-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/pl-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -92,7 +92,7 @@
 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}
 
--- a/etc/ps-prin0.ps	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/ps-prin0.ps	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/etc/ps-prin1.ps	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/ps-prin1.ps	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/etc/refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -80,7 +80,7 @@
 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}
 
--- a/etc/ru-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/ru-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -35,7 +35,7 @@
 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}
 
--- a/etc/sk-dired-ref.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/sk-dired-ref.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/etc/sk-refcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/sk-refcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -84,7 +84,7 @@
 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}
 
--- a/etc/sk-survival.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/sk-survival.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/etc/survival.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/survival.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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}
--- a/etc/vipcard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/vipcard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -73,7 +73,7 @@
 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}
 
--- a/etc/viperCard.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/etc/viperCard.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -81,7 +81,7 @@
 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}
 
--- a/leim/MISC-DIC/CTLau-b5.html	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/MISC-DIC/CTLau-b5.html	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
--- a/leim/MISC-DIC/CTLau.html	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/MISC-DIC/CTLau.html	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
--- a/leim/Makefile.in	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/Makefile.in	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/leim/leim-ext.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/leim-ext.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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=.
 
--- a/leim/quail/croatian.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/croatian.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/cyril-jis.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/cyril-jis.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/cyrillic.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/cyrillic.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/czech.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/czech.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/ethiopic.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/ethiopic.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
 
--- a/leim/quail/georgian.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/georgian.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/greek.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/greek.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hangul.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hangul.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hangul3.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hangul3.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hanja-jis.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hanja-jis.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hanja.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hanja.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hanja3.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hanja3.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/hebrew.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/hebrew.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/indian.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/indian.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/ipa.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/ipa.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/japanese.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/japanese.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/lao.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/lao.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/latin-alt.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/latin-alt.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
 
--- a/leim/quail/latin-ltx.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/latin-ltx.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/latin-post.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/latin-post.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
 
--- a/leim/quail/latin-pre.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/latin-pre.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/lrt.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/lrt.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/py-punct.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/py-punct.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/pypunct-b5.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/pypunct-b5.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
Binary file leim/quail/rfc1345.el has changed
--- a/leim/quail/sgml-input.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/sgml-input.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/slovak.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/slovak.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/symbol-ksc.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/symbol-ksc.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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)
--- a/leim/quail/thai.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/thai.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/uni-input.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/uni-input.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/viqr.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/viqr.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/vntelex.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/vntelex.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/leim/quail/welsh.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/leim/quail/welsh.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
 
--- a/lib-src/Makefile.in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/Makefile.in	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/lib-src/b2m.pl	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/b2m.pl	Mon Jul 04 15:47:28 2005 +0000
@@ -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 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";
 
--- a/lib-src/cvtmail.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/cvtmail.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
+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
--- a/lib-src/digest-doc.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/digest-doc.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
--- a/lib-src/ebrowse.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/ebrowse.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
--- a/lib-src/emacsclient.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/emacsclient.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 #define NO_SHORTNAMES
--- a/lib-src/emacstool.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/emacstool.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /*
  * For Emacs in SunView/Sun-Windows: (supported by Sun Unix v3.2 or greater)
--- a/lib-src/etags.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/etags.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
--- a/lib-src/fakemail.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/fakemail.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #define NO_SHORTNAMES
 #define _XOPEN_SOURCE 500	/* for cuserid */
--- a/lib-src/getopt.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/getopt.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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>.  */
--- a/lib-src/getopt.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/getopt.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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
 
--- a/lib-src/getopt1.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/getopt1.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
--- a/lib-src/grep-changelog	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/grep-changelog	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/lib-src/hexl.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/hexl.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
--- a/lib-src/make-docfile.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/make-docfile.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* 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.
--- a/lib-src/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/lib-src/movemail.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/movemail.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* 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
--- a/lib-src/ntlib.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/ntlib.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */
--- a/lib-src/ntlib.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/ntlib.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
 
 */
 
--- a/lib-src/pop.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/pop.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES	/* Tell config not to load remap.h */
--- a/lib-src/pop.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/pop.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #include <stdio.h>
 
--- a/lib-src/profile.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/profile.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /**
--- a/lib-src/rcs-checkin	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/rcs-checkin	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/lib-src/rcs2log	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/rcs2log	Mon Jul 04 15:47:28 2005 +0000
@@ -52,7 +52,7 @@
 
 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 @@
 #
 # 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.
--- a/lib-src/sorted-doc.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/sorted-doc.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
--- a/lib-src/test-distrib.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/test-distrib.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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>
--- a/lib-src/update-game-score.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/update-game-score.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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 program is allows a game to securely and atomically update a
    score file.  It should be installed setuid, owned by an appropriate
--- a/lib-src/vcdiff	Mon Jul 04 15:16:26 2005 +0000
+++ b/lib-src/vcdiff	Mon Jul 04 15:47:28 2005 +0000
@@ -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"
--- a/lispintro/Makefile.in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispintro/Makefile.in	Mon Jul 04 15:47:28 2005 +0000
@@ -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@
 
--- a/lispintro/emacs-lisp-intro.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispintro/emacs-lisp-intro.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -192,8 +192,8 @@
 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 @@
 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
 
--- a/lispintro/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispintro/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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 = .
 
--- a/lispintro/texinfo.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispintro/texinfo.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/lispref/Makefile.in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/Makefile.in	Mon Jul 04 15:47:28 2005 +0000
@@ -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@
--- a/lispref/doclicense.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/doclicense.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/lispref/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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 = .
--- a/lispref/tindex.pl	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/tindex.pl	Mon Jul 04 15:47:28 2005 +0000
@@ -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;
--- a/lispref/tips.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/tips.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -425,8 +425,8 @@
 
 ;; You should have received a copy of the GNU General Public
 ;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
+;; 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,
--- a/lispref/vol1.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/vol1.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -134,8 +134,8 @@
 @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
--- a/lispref/vol2.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/lispref/vol2.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -135,8 +135,8 @@
 @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
--- a/lwlib/lwlib-Xaw.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib-Xaw.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xlw.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib-Xlw.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xm.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib-Xm.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xm.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib-Xm.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifndef LWLIB_XM_H
 #define LWLIB_XM_H
--- a/lwlib/lwlib-utils.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib-utils.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/lwlib.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifdef NeXT
 #undef __STRICT_BSD__ /* ick */
--- a/lwlib/xlwmenu.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/xlwmenu.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Created by devin@lucid.com */
 
--- a/lwlib/xlwmenu.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/xlwmenu.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
--- a/lwlib/xlwmenuP.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/lwlib/xlwmenuP.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
--- a/mac/inc/config.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/config.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/dirent.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/dirent.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/epaths.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/epaths.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/grp.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/grp.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifndef _GRP_H
 #define _GRP_H
--- a/mac/inc/m-mac.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/m-mac.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/pwd.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/pwd.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/s-mac.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/s-mac.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/file.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/file.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/ioctl.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/ioctl.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/param.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/param.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/stat.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/stat.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/time.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/time.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/types.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/sys/types.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/termio.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/termio.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/utime.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/utime.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/utsname.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/inc/utsname.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/make-package	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/make-package	Mon Jul 04 15:47:28 2005 +0000
@@ -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).
 
--- a/mac/makefile.MPW	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/makefile.MPW	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/mac/src/Emacs.r	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/src/Emacs.r	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/src/EmacsMPW.r	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/src/EmacsMPW.r	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/src/chdir.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/mac/src/chdir.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/man/Makefile.in	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/Makefile.in	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/man/calc.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/calc.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -187,7 +187,7 @@
 
 @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.
--- a/man/doclicense.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/doclicense.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
--- a/man/faq.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/faq.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -518,8 +518,8 @@
 
 @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
--- a/man/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/man/mh-e.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/mh-e.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -3540,7 +3540,7 @@
 
 @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.
--- a/man/texinfo.tex	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/texinfo.tex	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/man/trouble.texi	Mon Jul 04 15:16:26 2005 +0000
+++ b/man/trouble.texi	Mon Jul 04 15:47:28 2005 +0000
@@ -595,8 +595,8 @@
 @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,
--- a/nt/addpm.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/addpm.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /****************************************************************************
  *
--- a/nt/addsection.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/addsection.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
 
    Andrew Innes <andrewi@harlequin.co.uk>       04-Jan-1999
      based on code from unexw32.c
--- a/nt/cmdproxy.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/cmdproxy.c	Mon Jul 04 15:47:28 2005 +0000
@@ -26,8 +26,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.  */
 
 #include <windows.h>
 
--- a/nt/config.nt	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/config.nt	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* No code in Emacs #includes config.h twice, but some of the code
--- a/nt/configure.bat	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/configure.bat	Mon Jul 04 15:47:28 2005 +0000
@@ -18,8 +18,8 @@
 
 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
--- a/nt/ddeclient.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/ddeclient.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #include <windows.h>
 #include <ddeml.h>
--- a/nt/envadd.bat	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/envadd.bat	Mon Jul 04 15:47:28 2005 +0000
@@ -17,8 +17,8 @@
 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:
--- a/nt/gmake.defs	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/gmake.defs	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
--- a/nt/inc/gettext.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/inc/gettext.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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
--- a/nt/inc/grp.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/inc/grp.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #ifndef _GRP_H
 #define _GRP_H
--- a/nt/inc/sys/socket.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/inc/sys/socket.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
+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 */
--- a/nt/makefile.w32-in	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/makefile.w32-in	Mon Jul 04 15:47:28 2005 +0000
@@ -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
 
--- a/nt/multi-install-info.bat	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/multi-install-info.bat	Mon Jul 04 15:47:28 2005 +0000
@@ -19,8 +19,8 @@
 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:
--- a/nt/nmake.defs	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/nmake.defs	Mon Jul 04 15:47:28 2005 +0000
@@ -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:
--- a/nt/paths.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/paths.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The default search path for Lisp function "load".
--- a/nt/preprep.c	Mon Jul 04 15:16:26 2005 +0000
+++ b/nt/preprep.c	Mon Jul 04 15:47:28 2005 +0000
@@ -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.
 
    Andrew Innes <andrewi@harlequin.co.uk>       16-Jan-1999
      based on code from addsection.c
--- a/src/m/7300.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/7300.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/acorn.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/acorn.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 
--- a/src/m/alliant-2800.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/alliant-2800.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/alliant.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/alliant.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/alpha.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/alpha.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/altos.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/altos.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/amdahl.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/amdahl.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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 for amdahl_uts created by modifying the template.h
--- a/src/m/amdx86-64.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/amdx86-64.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/apollo.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/apollo.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/arm.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/arm.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 
--- a/src/m/att3b.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/att3b.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/aviion.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/aviion.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/celerity.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/celerity.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/clipper.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/clipper.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/cnvrgnt.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/cnvrgnt.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/convex.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/convex.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/cydra5.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/cydra5.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/delta88k.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/delta88k.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/dpx2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/dpx2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/dual.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/dual.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/elxsi.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/elxsi.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/ews4800.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ews4800.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #undef LIB_STANDARD
 #undef C_DEBUG_SWITCH
--- a/src/m/gould-np1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/gould-np1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/gould.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/gould.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
+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
--- a/src/m/hp800.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/hp800.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/hp9000s300.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/hp9000s300.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/i860.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/i860.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ia64.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ia64.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #define BITS_PER_LONG		64
 #define BITS_PER_EMACS_INT	64
--- a/src/m/ibm370aix.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibm370aix.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #include "ibmps2-aix.h"
 
--- a/src/m/ibmps2-aix.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibmps2-aix.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrs6000.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibmrs6000.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrt-aix.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibmrt-aix.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrt.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibmrt.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibms390.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ibms390.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/intel386.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/intel386.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/iris4d.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/iris4d.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/irist.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/irist.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/isi-ov.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/isi-ov.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/m68k.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/m68k.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following three symbols give information on
--- a/src/m/macppc.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/macppc.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
--- a/src/m/masscomp.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/masscomp.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mega68.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/mega68.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mg1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/mg1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mips-siemens.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/mips-siemens.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
+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
--- a/src/m/mips.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/mips.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/news.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/news.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/next.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/next.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Say this machine is a next if not previously defined */
--- a/src/m/nh3000.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/nh3000.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/nh4000.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/nh4000.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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 manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/ns16000.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ns16000.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ns32000.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ns32000.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 
--- a/src/m/nu.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/nu.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/orion.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/orion.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/orion105.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/orion105.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/pfa50.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/pfa50.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/plexus.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/plexus.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/powermac.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/powermac.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/pyramid.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/pyramid.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sequent-ptx.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sequent-ptx.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sequent.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sequent.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sparc.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sparc.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/sps7.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sps7.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sr2k.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sr2k.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/stride.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/stride.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sun1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sun2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun386.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/sun386.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/symmetry.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/symmetry.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988]
  * Modified the sequent.h file for the Sequent Symmetry machine.
--- a/src/m/tad68k.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tad68k.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tahoe.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tahoe.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/targon31.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/targon31.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tek4300.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tek4300.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tekxd88.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tekxd88.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/template.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/template.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tower32.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tower32.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tower32v3.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/tower32v3.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 
--- a/src/m/ustation.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/ustation.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/vax.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/vax.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/wicat.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/wicat.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/windowsnt.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/windowsnt.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/xps100.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/m/xps100.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/s/aix3-1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/aix3-1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/bsd4-1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/bsd4-1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/bsd4-2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/bsd4-2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/bsd4-3.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/bsd4-3.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/cxux.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/cxux.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/cygwin.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/cygwin.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
--- a/src/s/darwin.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/darwin.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/dgux.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/dgux.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/dgux5-4-3.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/dgux5-4-3.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* 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
--- a/src/s/dgux5-4r2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/dgux5-4r2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #include "dgux.h"
 
--- a/src/s/freebsd.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/freebsd.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Get the correct __FreeBSD_version, even if this is before that was
    defined. */
--- a/src/s/gnu-linux.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/gnu-linux.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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 was put together by Michael K. Johnson and Rik Faith.  */
 
--- a/src/s/gnu.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/gnu.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /* Get most of the stuff from bsd4.3 */
--- a/src/s/hpux.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/hpux.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/iris3-5.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/iris3-5.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/iris3-6.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/iris3-6.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/irix3-3.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/irix3-3.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/lynxos.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/lynxos.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* LynxOS is almost a bsd 4.2 system */
 #include "s/bsd4-2.h"
--- a/src/s/ms-w32.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/ms-w32.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /*
  *      Define symbols to identify the version of Unix this is.
--- a/src/s/msdos.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/msdos.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
--- a/src/s/newsos5.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/newsos5.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Use the SysVr4 file for at least base configuration. */
 
--- a/src/s/nextstep.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/nextstep.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 #include "bsd4-3.h"
 
--- a/src/s/ptx.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/ptx.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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 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
--- a/src/s/riscix1-1.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/riscix1-1.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 #define  RISCiX_1_1	1
--- a/src/s/riscix12.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/riscix12.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 #define  RISCiX_1_2	1
--- a/src/s/rtu.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/rtu.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/sco4.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/sco4.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Ian Lance Taylor, ian@cygnus.com.  */
 
--- a/src/s/sco5.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/sco5.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /* Contributed by Mark Diekhans <markd@grizzly.com>.  */
 
--- a/src/s/template.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/template.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/umax.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/umax.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/unipl5-2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/unipl5-2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/usg5-0.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/usg5-0.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/usg5-2-2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/usg5-2-2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/usg5-2.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/usg5-2.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/usg5-3.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/usg5-3.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/usg5-4.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/usg5-4.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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 written by James Van Artsdalen of Dell Computer Corporation.
  * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
--- a/src/s/vms.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/vms.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/xenix.h	Mon Jul 04 15:16:26 2005 +0000
+++ b/src/s/xenix.h	Mon Jul 04 15:47:28 2005 +0000
@@ -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.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/vms/make-mms-derivative.el	Mon Jul 04 15:16:26 2005 +0000
+++ b/vms/make-mms-derivative.el	Mon Jul 04 15:47:28 2005 +0000
@@ -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: