aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2005-07-05 22:22:24 +0000
committerKaroly Lorentey <[email protected]>2005-07-05 22:22:24 +0000
commitd5dc920668a85c56c4d3e54a6898bbd43bcb64a1 (patch)
tree0dd89f6d64f668deafa71912ac0eb27f8f1240e7 /src
parent41be4f66fd33b17eba3e3ed4b8f8828c77f18517 (diff)
parent3ef97fb6a70598253c4f7f293b516f449389ff7e (diff)
Merged from [email protected] (patch 469)
Patches applied: * [email protected]/emacs--cvs-trunk--0--patch-469 Update from CVS git-archimport-id: [email protected]/emacs--multi-tty--0--patch-372
Diffstat (limited to 'src')
-rw-r--r--src/.gdbinit4
-rw-r--r--src/Makefile.in4
-rw-r--r--src/abbrev.c4
-rw-r--r--src/alloc.c4
-rw-r--r--src/atimer.c4
-rw-r--r--src/atimer.h4
-rw-r--r--src/blockinput.h4
-rw-r--r--src/buffer.c4
-rw-r--r--src/buffer.h4
-rw-r--r--src/bytecode.c4
-rw-r--r--src/callint.c4
-rw-r--r--src/callproc.c4
-rw-r--r--src/casefiddle.c4
-rw-r--r--src/casetab.c4
-rw-r--r--src/category.c4
-rw-r--r--src/category.h4
-rw-r--r--src/ccl.c4
-rw-r--r--src/ccl.h4
-rw-r--r--src/charset.c4
-rw-r--r--src/charset.h4
-rw-r--r--src/cm.c4
-rw-r--r--src/cm.h4
-rw-r--r--src/cmds.c4
-rw-r--r--src/coding.c4
-rw-r--r--src/coding.h4
-rw-r--r--src/commands.h4
-rw-r--r--src/composite.c4
-rw-r--r--src/composite.h4
-rw-r--r--src/config.in4
-rw-r--r--src/data.c4
-rw-r--r--src/dired.c4
-rw-r--r--src/dispextern.h4
-rw-r--r--src/dispnew.c4
-rw-r--r--src/disptab.h4
-rw-r--r--src/doc.c4
-rw-r--r--src/doprnt.c4
-rw-r--r--src/dosfns.c4
-rw-r--r--src/dosfns.h4
-rw-r--r--src/ecrt0.c4
-rw-r--r--src/editfns.c4
-rw-r--r--src/emacs.c4
-rw-r--r--src/epaths.in4
-rw-r--r--src/eval.c4
-rw-r--r--src/fileio.c4
-rw-r--r--src/filelock.c4
-rw-r--r--src/filemode.c2
-rw-r--r--src/firstfile.c4
-rw-r--r--src/floatfns.c4
-rw-r--r--src/fns.c4
-rw-r--r--src/fontset.c4
-rw-r--r--src/fontset.h4
-rw-r--r--src/frame.c4
-rw-r--r--src/frame.h4
-rw-r--r--src/fringe.c4
-rw-r--r--src/getloadavg.c2
-rw-r--r--src/getpagesize.h4
-rw-r--r--src/gmalloc.c35
-rw-r--r--src/gtkutil.c4
-rw-r--r--src/gtkutil.h4
-rw-r--r--src/image.c4
-rw-r--r--src/indent.c4
-rw-r--r--src/indent.h4
-rw-r--r--src/insdel.c4
-rw-r--r--src/intervals.c4
-rw-r--r--src/intervals.h4
-rw-r--r--src/keyboard.c4
-rw-r--r--src/keyboard.h4
-rw-r--r--src/keymap.c4
-rw-r--r--src/keymap.h4
-rw-r--r--src/lastfile.c4
-rw-r--r--src/lisp.h4
-rw-r--r--src/lread.c4
-rw-r--r--src/m/7300.h4
-rw-r--r--src/m/acorn.h4
-rw-r--r--src/m/alliant-2800.h4
-rw-r--r--src/m/alliant.h4
-rw-r--r--src/m/alpha.h4
-rw-r--r--src/m/altos.h4
-rw-r--r--src/m/amdahl.h4
-rw-r--r--src/m/amdx86-64.h4
-rw-r--r--src/m/apollo.h4
-rw-r--r--src/m/arm.h4
-rw-r--r--src/m/att3b.h4
-rw-r--r--src/m/aviion.h4
-rw-r--r--src/m/celerity.h4
-rw-r--r--src/m/clipper.h4
-rw-r--r--src/m/cnvrgnt.h4
-rw-r--r--src/m/convex.h4
-rw-r--r--src/m/cydra5.h4
-rw-r--r--src/m/delta88k.h4
-rw-r--r--src/m/dpx2.h4
-rw-r--r--src/m/dual.h4
-rw-r--r--src/m/elxsi.h4
-rw-r--r--src/m/ews4800.h4
-rw-r--r--src/m/gould-np1.h4
-rw-r--r--src/m/gould.h4
-rw-r--r--src/m/hp800.h4
-rw-r--r--src/m/hp9000s300.h4
-rw-r--r--src/m/i860.h4
-rw-r--r--src/m/ia64.h4
-rw-r--r--src/m/ibm370aix.h4
-rw-r--r--src/m/ibmps2-aix.h4
-rw-r--r--src/m/ibmrs6000.h4
-rw-r--r--src/m/ibmrt-aix.h4
-rw-r--r--src/m/ibmrt.h4
-rw-r--r--src/m/ibms390.h4
-rw-r--r--src/m/intel386.h4
-rw-r--r--src/m/iris4d.h4
-rw-r--r--src/m/irist.h4
-rw-r--r--src/m/isi-ov.h4
-rw-r--r--src/m/m68k.h4
-rw-r--r--src/m/macppc.h4
-rw-r--r--src/m/masscomp.h4
-rw-r--r--src/m/mega68.h4
-rw-r--r--src/m/mg1.h4
-rw-r--r--src/m/mips-siemens.h4
-rw-r--r--src/m/mips.h4
-rw-r--r--src/m/news.h4
-rw-r--r--src/m/next.h4
-rw-r--r--src/m/nh3000.h4
-rw-r--r--src/m/nh4000.h4
-rw-r--r--src/m/ns16000.h4
-rw-r--r--src/m/ns32000.h4
-rw-r--r--src/m/nu.h4
-rw-r--r--src/m/orion.h4
-rw-r--r--src/m/orion105.h4
-rw-r--r--src/m/pfa50.h4
-rw-r--r--src/m/plexus.h4
-rw-r--r--src/m/powermac.h4
-rw-r--r--src/m/powerpcle.h3
-rw-r--r--src/m/pyramid.h4
-rw-r--r--src/m/sequent-ptx.h4
-rw-r--r--src/m/sequent.h4
-rw-r--r--src/m/sparc.h4
-rw-r--r--src/m/sps7.h4
-rw-r--r--src/m/sr2k.h4
-rw-r--r--src/m/stride.h4
-rw-r--r--src/m/sun1.h4
-rw-r--r--src/m/sun2.h4
-rw-r--r--src/m/sun386.h4
-rw-r--r--src/m/symmetry.h4
-rw-r--r--src/m/tad68k.h4
-rw-r--r--src/m/tahoe.h4
-rw-r--r--src/m/targon31.h4
-rw-r--r--src/m/tek4300.h4
-rw-r--r--src/m/tekxd88.h4
-rw-r--r--src/m/template.h4
-rw-r--r--src/m/tower32.h4
-rw-r--r--src/m/tower32v3.h4
-rw-r--r--src/m/ustation.h4
-rw-r--r--src/m/vax.h4
-rw-r--r--src/m/wicat.h4
-rw-r--r--src/m/windowsnt.h4
-rw-r--r--src/m/xps100.h4
-rw-r--r--src/mac.c4
-rw-r--r--src/macfns.c4
-rw-r--r--src/macgui.h4
-rw-r--r--src/macmenu.c4
-rw-r--r--src/macros.c4
-rw-r--r--src/macros.h4
-rw-r--r--src/macselect.c4
-rw-r--r--src/macterm.c4
-rw-r--r--src/macterm.h4
-rw-r--r--src/makefile.w32-in4
-rw-r--r--src/marker.c4
-rw-r--r--src/md5.c4
-rw-r--r--src/md5.h4
-rw-r--r--src/mem-limits.h4
-rw-r--r--src/minibuf.c4
-rw-r--r--src/mktime.c2
-rw-r--r--src/msdos.c4
-rw-r--r--src/msdos.h4
-rw-r--r--src/prefix-args.c4
-rw-r--r--src/print.c4
-rw-r--r--src/process.c4
-rw-r--r--src/process.h4
-rw-r--r--src/puresize.h4
-rw-r--r--src/ralloc.c4
-rw-r--r--src/regex.c2
-rw-r--r--src/regex.h2
-rw-r--r--src/region-cache.c4
-rw-r--r--src/region-cache.h4
-rw-r--r--src/s/aix3-1.h4
-rw-r--r--src/s/bsd4-1.h4
-rw-r--r--src/s/bsd4-2.h4
-rw-r--r--src/s/bsd4-3.h4
-rw-r--r--src/s/cxux.h4
-rw-r--r--src/s/cygwin.h4
-rw-r--r--src/s/darwin.h4
-rw-r--r--src/s/dgux.h4
-rw-r--r--src/s/dgux4.h3
-rw-r--r--src/s/dgux5-4-3.h4
-rw-r--r--src/s/dgux5-4r2.h4
-rw-r--r--src/s/freebsd.h4
-rw-r--r--src/s/gnu-linux.h4
-rw-r--r--src/s/gnu.h4
-rw-r--r--src/s/hpux.h4
-rw-r--r--src/s/iris3-5.h4
-rw-r--r--src/s/iris3-6.h4
-rw-r--r--src/s/irix3-3.h4
-rw-r--r--src/s/lynxos.h4
-rw-r--r--src/s/ms-w32.h4
-rw-r--r--src/s/msdos.h4
-rw-r--r--src/s/newsos5.h4
-rw-r--r--src/s/nextstep.h4
-rw-r--r--src/s/ptx.h4
-rw-r--r--src/s/riscix1-1.h4
-rw-r--r--src/s/riscix12.h4
-rw-r--r--src/s/rtu.h4
-rw-r--r--src/s/sco4.h4
-rw-r--r--src/s/sco5.h4
-rw-r--r--src/s/template.h4
-rw-r--r--src/s/umax.h4
-rw-r--r--src/s/unipl5-2.h4
-rw-r--r--src/s/usg5-0.h4
-rw-r--r--src/s/usg5-2-2.h4
-rw-r--r--src/s/usg5-2.h4
-rw-r--r--src/s/usg5-3.h4
-rw-r--r--src/s/usg5-4.h4
-rw-r--r--src/s/vms.h4
-rw-r--r--src/s/xenix.h4
-rw-r--r--src/scroll.c4
-rw-r--r--src/search.c4
-rw-r--r--src/sheap.c4
-rw-r--r--src/sound.c4
-rw-r--r--src/strftime.c4
-rw-r--r--src/sunfns.c4
-rw-r--r--src/syntax.c4
-rw-r--r--src/syntax.h4
-rw-r--r--src/sysdep.c4
-rw-r--r--src/sysselect.h4
-rw-r--r--src/syssignal.h4
-rw-r--r--src/systime.h4
-rw-r--r--src/systty.h4
-rw-r--r--src/syswait.h4
-rw-r--r--src/term.c4
-rw-r--r--src/termcap.c4
-rw-r--r--src/termchar.h4
-rw-r--r--src/termhooks.h4
-rw-r--r--src/terminfo.c4
-rw-r--r--src/termopts.h4
-rw-r--r--src/textprop.c4
-rw-r--r--src/tparam.c4
-rw-r--r--src/uaf.h4
-rw-r--r--src/undo.c4
-rw-r--r--src/unexaix.c4
-rw-r--r--src/unexalpha.c4
-rw-r--r--src/unexapollo.c4
-rw-r--r--src/unexconvex.c4
-rw-r--r--src/unexcw.c4
-rw-r--r--src/unexec.c4
-rw-r--r--src/unexelf.c4
-rw-r--r--src/unexenix.c4
-rw-r--r--src/unexmacosx.c4
-rw-r--r--src/unexmips.c4
-rw-r--r--src/unexnext.c4
-rw-r--r--src/unexsni.c4
-rw-r--r--src/unexsunos4.c4
-rw-r--r--src/unexw32.c4
-rw-r--r--src/vm-limit.c4
-rw-r--r--src/w16select.c4
-rw-r--r--src/w32.c4
-rw-r--r--src/w32.h4
-rw-r--r--src/w32bdf.c4
-rw-r--r--src/w32bdf.h4
-rw-r--r--src/w32console.c4
-rw-r--r--src/w32fns.c4
-rw-r--r--src/w32gui.h4
-rw-r--r--src/w32heap.c4
-rw-r--r--src/w32heap.h4
-rw-r--r--src/w32inevt.c4
-rw-r--r--src/w32inevt.h4
-rw-r--r--src/w32menu.c4
-rw-r--r--src/w32proc.c4
-rw-r--r--src/w32reg.c4
-rw-r--r--src/w32select.c4
-rw-r--r--src/w32term.c4
-rw-r--r--src/w32term.h4
-rw-r--r--src/w32xfns.c4
-rw-r--r--src/widget.c4
-rw-r--r--src/widget.h4
-rw-r--r--src/widgetprv.h4
-rw-r--r--src/window.c4
-rw-r--r--src/window.h4
-rw-r--r--src/xdisp.c4
-rw-r--r--src/xfaces.c4
-rw-r--r--src/xfns.c4
-rw-r--r--src/xmenu.c4
-rw-r--r--src/xrdb.c4
-rw-r--r--src/xselect.c4
-rw-r--r--src/xsmfns.c4
-rw-r--r--src/xterm.c4
-rw-r--r--src/xterm.h4
293 files changed, 597 insertions, 594 deletions
diff --git a/src/.gdbinit b/src/.gdbinit
index 760822236f..66b9e64ec7 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -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.
# Force loading of symbols, enough to give us gdb_valbits etc.
set main
diff --git a/src/Makefile.in b/src/Makefile.in
index 3407f9024e..d118557db3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,8 +16,8 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Note that this file is edited by msdos/sed1v2.inp for MSDOS. That
diff --git a/src/abbrev.c b/src/abbrev.c
index 3883e35da3..8cb87f2c88 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/alloc.c b/src/alloc.c
index 98fa4be695..dddfda828e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/atimer.c b/src/atimer.c
index ff5b8faaf3..9ac6d529b9 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/atimer.h b/src/atimer.h
index f987a47a6b..5057eb2be2 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_ATIMER_H
#define EMACS_ATIMER_H
diff --git a/src/blockinput.h b/src/blockinput.h
index 6aa865ea9b..3655971553 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_BLOCKINPUT_H
#define EMACS_BLOCKINPUT_H
diff --git a/src/buffer.c b/src/buffer.c
index ed05daf77e..43727ce7b9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/buffer.h b/src/buffer.h
index 08627487c6..8d170c8756 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Accessing the parameters of the current buffer. */
diff --git a/src/bytecode.c b/src/bytecode.c
index 6b05a3270d..73b8f60a1a 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
hacked on by [email protected] 17-jun-91
o added a compile-time switch to turn on simple sanity checking;
diff --git a/src/callint.c b/src/callint.c
index dea776e0f1..10db39ddce 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/callproc.c b/src/callproc.c
index fe198b0770..b78fae1d07 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 9af4015fbb..b063ef7510 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/casetab.c b/src/casetab.c
index d7dcb420c8..448a236f56 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by Howard Gayle. */
diff --git a/src/category.c b/src/category.c
index 1cae5a6e75..e1e59a317a 100644
--- a/src/category.c
+++ b/src/category.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Here we handle three objects: category, category set, and category
diff --git a/src/category.h b/src/category.h
index 5607efaed6..ac79c13a83 100644
--- a/src/category.h
+++ b/src/category.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* We introduce here three types of object: category, category set,
diff --git a/src/ccl.c b/src/ccl.c
index 3ce0eb77f7..b6381f7a0c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/ccl.h b/src/ccl.h
index 1c9c1b3b34..0a89783538 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_CCL_H
#define EMACS_CCL_H
diff --git a/src/charset.c b/src/charset.c
index 4a51c389d6..e7b6897ea9 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* At first, see the document in `charset.h' to understand the code in
this file. */
diff --git a/src/charset.h b/src/charset.h
index b49ed87a3a..43791baf0c 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_CHARSET_H
#define EMACS_CHARSET_H
diff --git a/src/cm.c b/src/cm.c
index 9f9cc0e0a3..16df727314 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/cm.h b/src/cm.h
index 1b6c9522bb..69ddd7f74d 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Holds the minimum and maximum costs for the parametrized capabilities. */
struct parmcap
diff --git a/src/cmds.c b/src/cmds.c
index b989bab46e..7940f3cf21 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/coding.c b/src/coding.c
index 7111862b65..79b1c93cb3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*** TABLE OF CONTENTS ***
diff --git a/src/coding.h b/src/coding.h
index f363032228..4081b7f202 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_CODING_H
#define EMACS_CODING_H
diff --git a/src/commands.h b/src/commands.h
index b9b1ad4193..9486467e2f 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#define Ctl(c) ((c)&037)
diff --git a/src/composite.c b/src/composite.c
index ff2eed925d..dffac5c01f 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include "lisp.h"
diff --git a/src/composite.h b/src/composite.h
index 5343dd5146..9dfe597631 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_COMPOSITE_H
#define EMACS_COMPOSITE_H
diff --git a/src/config.in b/src/config.in
index 5fb1f530d4..f4ab9fbb3d 100644
--- a/src/config.in
+++ b/src/config.in
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* No code in Emacs #includes config.h twice, but some bits of code
diff --git a/src/data.c b/src/data.c
index c74d3c076c..4102af809c 100644
--- a/src/data.c
+++ b/src/data.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/dired.c b/src/dired.c
index 349154e1ac..55f96d2888 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/dispextern.h b/src/dispextern.h
index 3501d1de1e..9a1d484064 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* New redisplay written by Gerd Moellmann <[email protected]>. */
diff --git a/src/dispnew.c b/src/dispnew.c
index 6a95d2e38d..4bae5a231a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/disptab.h b/src/disptab.h
index d3bf54ea4f..30b2a7a748 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Access the slots of a display-table, according to their purpose. */
diff --git a/src/doc.c b/src/doc.c
index d3e58f4b6c..6d8b625aff 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/doprnt.c b/src/doprnt.c
index 8137af2889..1cfc5aecee 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/dosfns.c b/src/dosfns.c
index bd62147ad4..6192836e97 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/dosfns.h b/src/dosfns.h
index 24d214fc1b..594c3d980c 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -19,8 +19,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
extern EMACS_INT dos_hyper_key;
extern EMACS_INT dos_super_key;
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 209748c8c9..95b69b11c0 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The standard Vax 4.2 Unix crt0.c cannot be used for Emacs
diff --git a/src/editfns.c b/src/editfns.c
index a7296c4428..05888fd484 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/emacs.c b/src/emacs.c
index 5e0f42981f..af23f8b913 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/epaths.in b/src/epaths.in
index 00a1a1d04f..be91cb485a 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The default search path for Lisp function "load".
This sets load-path. */
diff --git a/src/eval.c b/src/eval.c
index 17e9f7f436..f625258229 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/fileio.c b/src/fileio.c
index 24820f6d3f..769dc14e77 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/filelock.c b/src/filelock.c
index 5ddec8616f..de348f61a9 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/filemode.c b/src/filemode.c
index 058880d669..130cbace77 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/src/firstfile.c b/src/firstfile.c
index faa192257b..cf6dbf3e88 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/floatfns.c b/src/floatfns.c
index a64186611d..529e7b76e3 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* ANSI C requires only these float functions:
diff --git a/src/fns.c b/src/fns.c
index 7365aa05e7..f1e83f727a 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/fontset.c b/src/fontset.c
index 8d4507530f..e3bb1ced2f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* #define FONTSET_DEBUG */
diff --git a/src/fontset.h b/src/fontset.h
index eee5e515b9..7d2def16cf 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_FONTSET_H
#define EMACS_FONTSET_H
diff --git a/src/frame.c b/src/frame.c
index 52ae319129..f32ad7a936 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/frame.h b/src/frame.h
index c4190255b7..625f3ffa81 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Don't multiply include: dispextern.h includes macterm.h which
includes frame.h some emacs source includes both dispextern.h and
diff --git a/src/fringe.c b/src/fringe.c
index 19e6e60d11..7731c0302e 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 9a104cee7d..191f7d4244 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Compile-time symbols that this file uses:
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 269a2ff17f..20f19279cd 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef HAVE_GETPAGESIZE
diff --git a/src/gmalloc.c b/src/gmalloc.c
index eae83a74eb..08de77df0e 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -20,8 +20,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -339,8 +339,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -942,8 +942,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -1261,8 +1261,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -1506,8 +1506,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -1546,7 +1546,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with the GNU C Library; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA. */
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
@@ -1602,8 +1603,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
@@ -1702,8 +1703,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
@@ -1769,8 +1770,8 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address [email protected],
or (US mail) as Mike Haertel c/o Free Software Foundation. */
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8bd83e4004..1cb1004f57 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "config.h"
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 44e82885d7..08ba9ee131 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef GTKUTIL_H
#define GTKUTIL_H
diff --git a/src/image.c b/src/image.c
index b2d0cf4ff5..928ec0437a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/indent.c b/src/indent.c
index 39602c60d1..2dc113a908 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/indent.h b/src/indent.h
index 8c2d1f36ad..39db7b8cf5 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* We introduce new member `tab_offset'. We need it because of the
existence of wide-column characters. There is a case that the
diff --git a/src/insdel.c b/src/insdel.c
index ad6623c669..4760342c56 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/intervals.c b/src/intervals.c
index a822dafefc..cb60061fdc 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* NOTES:
diff --git a/src/intervals.h b/src/intervals.h
index f3b281f418..374f898416 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "dispextern.h"
diff --git a/src/keyboard.c b/src/keyboard.c
index 4a4afa326f..599ab28261 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/keyboard.h b/src/keyboard.h
index 91226ce6e6..b95482762e 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Length of echobuf field in each KBOARD. */
diff --git a/src/keymap.c b/src/keymap.c
index a8d197208b..b9247122cc 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/keymap.h b/src/keymap.h
index bec3918686..4fcbffbed5 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef KEYMAP_H
#define KEYMAP_H
diff --git a/src/lastfile.c b/src/lastfile.c
index d6292e3004..d03dc2c834 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* How this works:
diff --git a/src/lisp.h b/src/lisp.h
index 4d84cfa9f6..b51d535f02 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_LISP_H
#define EMACS_LISP_H
diff --git a/src/lread.c b/src/lread.c
index f02252fe47..f159e98d4e 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/m/7300.h b/src/m/7300.h
index 17dde0c918..fa95b3d9c4 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 6f0a77be44..66978329d7 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index 213af43266..cf0afd90bb 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/alliant.h b/src/m/alliant.h
index c9c1c70cc9..a32e514271 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3e1d378b29..aff6182270 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/altos.h b/src/m/altos.h
index b71d006f24..e3cf089877 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 37cb8c0d36..8b32a2e64d 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
This file for amdahl_uts created by modifying the template.h
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0192afc9d4..61b18dcc31 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/apollo.h b/src/m/apollo.h
index e28ffef337..8fa91c004c 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/arm.h b/src/m/arm.h
index d3a95521e7..1ebcf3be4a 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 559ac2f3c6..949e6b1d01 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 7705ef645f..13a262423b 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 55beedb7c4..0b0bb02012 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/clipper.h b/src/m/clipper.h
index dc4dd0c2df..5da09e02fb 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index d44eff6700..cb344f98f7 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/convex.h b/src/m/convex.h
index a871d4ac21..97b291743d 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 12b757305b..e2813dc2a4 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 89889824fd..ab0a48a4e3 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 1a2b99cdff..7a24c3940d 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/dual.h b/src/m/dual.h
index 392cb64eb4..253c12bec5 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 1795d9815d..f8de360969 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index b782542348..dcb46bf83d 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#undef LIB_STANDARD
#undef C_DEBUG_SWITCH
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 145d682afb..4a26786508 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/gould.h b/src/m/gould.h
index eeac2aef2f..3a382ca0c1 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -21,8 +21,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 8f08ed3b61..64243f4be3 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 24c9a521d0..8886aec204 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/i860.h b/src/m/i860.h
index 9d56b886f6..66ca2b8fa6 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 947bb9d456..33d843c773 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#define BITS_PER_LONG 64
#define BITS_PER_EMACS_INT 64
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 3fb228afa1..b958656c3e 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "ibmps2-aix.h"
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index eb843ffe71..d2202d6547 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 5be14b0488..b76d03bc0b 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 8bce9fb6f6..b9ea0e6208 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 9c26264057..1388a46b00 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 8797a49d30..af7fbb8dfb 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/intel386.h b/src/m/intel386.h
index e240beb91a..c63dae7af0 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 8d3b7a883b..a13a6f8c2f 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/irist.h b/src/m/irist.h
index d2b9dd2831..71726977b2 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index ef481e13f2..9b35f03ea7 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/m68k.h b/src/m/m68k.h
index ce7b268bbe..9fdcf1511b 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following three symbols give information on
diff --git a/src/m/macppc.h b/src/m/macppc.h
index c068fca32a..36022af3e5 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
is the most significant byte. */
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 34ea78696c..4582e29b6b 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/mega68.h b/src/m/mega68.h
index e86a504868..ba7ee6b48d 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 5a6250c3c3..47d34f4376 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 11b1f971d2..f00790210c 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -20,8 +20,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/mips.h b/src/m/mips.h
index cca4586817..e868423642 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/news.h b/src/m/news.h
index 1a594ad82a..1d2585c09a 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/next.h b/src/m/next.h
index 1e8a3d3a31..2f2952e10f 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Say this machine is a next if not previously defined */
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index d6c09bd65b..7be5c5dc7d 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
* series Motorola 88100 and 88110 based machines.
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 70804ef2c3..3d8794b280 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
* series Motorola 88100 and 88110 based machines.
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 549f648c7f..07fff86502 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 214954b631..9a135fe2d9 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
diff --git a/src/m/nu.h b/src/m/nu.h
index 44abc92905..8ca0315531 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/orion.h b/src/m/orion.h
index 76519f6fe6..e4fa852966 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/orion105.h b/src/m/orion105.h
index c58f922206..d0adaba70e 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index c6762a9312..be430d25fd 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/plexus.h b/src/m/plexus.h
index b7012c750d..a2f6cc545a 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/powermac.h b/src/m/powermac.h
index dc698675ea..c41003ae61 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index 4733156337..34096a37d1 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 7ba6a9e058..7e0db61ec5 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index a72c705578..57d255a861 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sequent.h b/src/m/sequent.h
index 7e45c4f4fd..7c572f54f6 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8656152fb7..6926aced07 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/sps7.h b/src/m/sps7.h
index ba4eae1851..3bd0c94bcc 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 088ea23d94..83dbf4941f 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/stride.h b/src/m/stride.h
index 941b9d7cc9..f176a7642a 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 54d51106e6..7ab8121870 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 33f811aea0..452fdfc7c0 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/sun386.h b/src/m/sun386.h
index d3866e8f17..782e10925e 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index ca584c9c6e..262d647475 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* CHANGE: [Eric H. Herrin II; [email protected] - 15 Sept 1988]
* Modified the sequent.h file for the Sequent Symmetry machine.
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 084e432223..4c904aaf56 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 42741e25cb..988624839b 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/targon31.h b/src/m/targon31.h
index afc72f4e0e..08ecb681bd 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 34b160ba6d..164df72210 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index a30bbdd8d6..7af3dab6a0 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
diff --git a/src/m/template.h b/src/m/template.h
index 914daa3047..c088efff81 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 947e495aa2..c5f34d065e 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index fbd7e032a3..927dfca93d 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
diff --git a/src/m/ustation.h b/src/m/ustation.h
index b03a355535..e7068f3cd8 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/vax.h b/src/m/vax.h
index 2e9d4738b6..22fda95abc 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/wicat.h b/src/m/wicat.h
index bca10df352..bd8fcefe99 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 701e6e21e1..39c7baa9de 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 617b0a9c1d..c6e54710bd 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* The following line tells the configuration script what sort of
diff --git a/src/mac.c b/src/mac.c
index eaf4f029cf..ef136ab651 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/macfns.c b/src/macfns.c
index d0e97e15f6..b9f7e2bed5 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/macgui.h b/src/macgui.h
index 939496aaee..d9948278d1 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/macmenu.c b/src/macmenu.c
index ee83a5f609..ab266f6f0b 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/macros.c b/src/macros.c
index 8b17c9fb26..6f854018d6 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/macros.h b/src/macros.h
index bf33ea8325..d9b99b9984 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Kbd macro currently being executed (a string or vector). */
diff --git a/src/macselect.c b/src/macselect.c
index 890bb62d1d..b519950eb7 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/macterm.c b/src/macterm.c
index a97dc6203f..ab43a7bda4 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/macterm.h b/src/macterm.h
index 79c78e3f0e..ea5f7db608 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index c631852c0f..a4084046fa 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
ALL = emacs
diff --git a/src/marker.c b/src/marker.c
index ab054ba2dd..d6029c79c9 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/md5.c b/src/md5.c
index c8df5616fa..039213fd76 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -15,8 +15,8 @@
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* Written by Ulrich Drepper <[email protected]>, 1995. */
diff --git a/src/md5.h b/src/md5.h
index e1cb3dd2e5..229da8daa8 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 57a79863a1..aac8a39617 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef MSDOS
#include <dpmi.h>
diff --git a/src/minibuf.c b/src/minibuf.c
index 85cee34420..e04be1465e 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/mktime.c b/src/mktime.c
index cd8f025403..c61f146356 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Define this to have a standalone program to test this implementation of
diff --git a/src/msdos.c b/src/msdos.c
index e17e79a6d1..07ee522f98 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Morten Welinder */
/* New display, keyboard, and mouse control by Kim F. Storm */
diff --git a/src/msdos.h b/src/msdos.h
index a07979d2f6..7f2f013fd1 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_MSDOS_H
#define EMACS_MSDOS_H
diff --git a/src/prefix-args.c b/src/prefix-args.c
index eeeb1038a4..5cfe6e4a09 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Jim Blandy <[email protected]> - September 1992
diff --git a/src/print.c b/src/print.c
index 47e338e849..6150ff2efe 100644
--- a/src/print.c
+++ b/src/print.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/process.c b/src/process.c
index 5ef0dd3f5f..3879821c2f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/process.h b/src/process.h
index 8e3f9028c0..a58b08a197 100644
--- a/src/process.h
+++ b/src/process.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This structure records information about a subprocess
diff --git a/src/puresize.h b/src/puresize.h
index 83bb65e3ab..2e7637c672 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
diff --git a/src/ralloc.c b/src/ralloc.c
index fd0d62e197..824fb536fc 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* NOTES:
diff --git a/src/regex.c b/src/regex.c
index 44feee4cdd..c82bdb0edd 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
/* TODO:
diff --git a/src/regex.h b/src/regex.h
index 2cdb02993b..89532b7ee9 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _REGEX_H
diff --git a/src/region-cache.c b/src/region-cache.c
index 251382a5a0..22eac35ca8 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/region-cache.h b/src/region-cache.h
index 9c104b51a1..5c27d00740 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This code was written by Jim Blandy <[email protected]> to help
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index b96bf4373b..8fe7bd8fa2 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 624f7090f8..7316841e21 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index e39a8c8194..386ab1bbbe 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index f5db6fbb5c..bbb2715bdf 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/cxux.h b/src/s/cxux.h
index fd8b00ff2b..2af6d00609 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 38e346ac51..0094ef793d 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* SYSTEM_TYPE should indicate the kind of system you are using.
It sets the Lisp variable system-type. */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 970e954b61..fea5b4c282 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 4c4a84d999..fb01b539f2 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
* Define symbols to identify the version of Unix this is.
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 7a1eaf4210..d866d63e6c 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -16,7 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file was written by Roderick Schertler <[email protected]>,
contact me if you have problems with or comments about running Emacs
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index 3d4c4775c9..a95420595a 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5
compiler. You must upgraded to at least gcc-2.5.8. If you are
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index 7121f5e18a..c2c7461a20 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "dgux.h"
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index dbd08f5b3b..dc26eb9f39 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Get the correct __FreeBSD_version, even if this is before that was
defined. */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3cf21756d7..2563496af5 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file was put together by Michael K. Johnson and Rik Faith. */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index f7fb4899db..79e5a88a7b 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Get most of the stuff from bsd4.3 */
diff --git a/src/s/hpux.h b/src/s/hpux.h
index debf6aad6d..665b1f3063 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 51391d56e9..8815bb56f3 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 50d0962e48..64187428c2 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index fad50aa20f..60dd6d49c7 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 017e1892c1..55de8cba6f 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* LynxOS is almost a bsd 4.2 system */
#include "s/bsd4-2.h"
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 10e3bfe3a5..c4697db34d 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
* Define symbols to identify the version of Unix this is.
diff --git a/src/s/msdos.h b/src/s/msdos.h
index cef2184a37..5a0cbba595 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Note: lots of stuff here was taken from s-msdos.h in demacs. */
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index f4ab0597ee..c674bfc559 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Use the SysVr4 file for at least base configuration. */
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 36549e88bf..9253e6acff 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "bsd4-3.h"
diff --git a/src/s/ptx.h b/src/s/ptx.h
index dab0f0f205..e490ba659a 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file was written by Bill Burton <[email protected]>. Parts were
adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 15092f59ad..ccfa5704b8 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#define RISCiX_1_1 1
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index 988fbd61ba..b0e00e780c 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#define RISCiX_1_2 1
diff --git a/src/s/rtu.h b/src/s/rtu.h
index afe63b5efc..92afbaf632 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/sco4.h b/src/s/sco4.h
index b39c7a7545..757eb0b57b 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Ian Lance Taylor, [email protected]. */
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 096944b833..e490a91b60 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Mark Diekhans <[email protected]>. */
diff --git a/src/s/template.h b/src/s/template.h
index e969c72e0a..5ef1049164 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/umax.h b/src/s/umax.h
index 36f5499a4b..1741b1d04e 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0a395b22a0..05d162239a 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index ecce9d92c7..21b469dcd5 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index a360fd64d7..dff90efb22 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 375dba75f5..0da477276f 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index de1a20d265..285bae670d 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 719b8c389a..4edda95b39 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* This file written by James Van Artsdalen of Dell Computer Corporation.
* [email protected]. Subsequently improved for Dell 2.2 by Eric
diff --git a/src/s/vms.h b/src/s/vms.h
index 1338cdb571..9afd69b853 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
* Define symbols to identify the version of Unix this is.
diff --git a/src/s/xenix.h b/src/s/xenix.h
index c0840bcd3b..763a10956f 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
* Define symbols to identify the version of Unix this is.
diff --git a/src/scroll.c b/src/scroll.c
index 5991fec004..f73f6f4fa8 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/search.c b/src/search.c
index ae2d323433..6beaa2d418 100644
--- a/src/search.c
+++ b/src/search.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/sheap.c b/src/sheap.c
index 714eb9a710..b7f01d448a 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/sound.c b/src/sound.c
index 134b69dc81..93e456cbc4 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by Gerd Moellmann <[email protected]>. Tested with Luigi's
driver on FreeBSD 2.2.7 with a SoundBlaster 16. */
diff --git a/src/strftime.c b/src/strftime.c
index 4d3a9d1d31..41566ec868 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -18,8 +18,8 @@
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/sunfns.c b/src/sunfns.c
index 13fdfd3a1b..6a16e6cc08 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -25,8 +25,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Author: Jeff Peck, Sun Microsystems, Inc. <[email protected]>
Original ideas by David Kastan and Eric Negaard, SRI International
diff --git a/src/syntax.c b/src/syntax.c
index 52067b8f8f..480fa6de82 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/syntax.h b/src/syntax.h
index cb1eeb6268..581b4a783e 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
extern Lisp_Object Qsyntax_table_p;
diff --git a/src/sysdep.c b/src/sysdep.c
index 52f2855d33..06adc855f7 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/sysselect.h b/src/sysselect.h
index 866a65e920..0030e737bc 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef HAVE_SYS_SELECT_H
#if defined (DARWIN) || defined (MAC_OSX)
diff --git a/src/syssignal.h b/src/syssignal.h
index ab61d11139..2f8aa43f2f 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
extern void init_signals P_ ((void));
diff --git a/src/systime.h b/src/systime.h
index 778e555c97..cf2bc0b084 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_SYSTIME_H
#define EMACS_SYSTIME_H
diff --git a/src/systty.h b/src/systty.h
index a975bcd13a..b322ca6008 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef HAVE_TERMIOS
#define HAVE_TCATTR
diff --git a/src/syswait.h b/src/syswait.h
index 066f4e5a48..78057e3fed 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Define the structure that the wait system call stores.
On many systems, there is a structure defined for this.
diff --git a/src/term.c b/src/term.c
index 4fbf87daba..ac1ef07331 100644
--- a/src/term.c
+++ b/src/term.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* New redisplay, TTY faces by Gerd Moellmann <[email protected]>. */
diff --git a/src/termcap.c b/src/termcap.c
index aa30aaa061..5f2fa55556 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with 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. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H
diff --git a/src/termchar.h b/src/termchar.h
index 58d0ba2423..ad7104ac89 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Each termcap frame points to its own struct tty_output object in
the output_data.tty field. The tty_output structure contains the
diff --git a/src/termhooks.h b/src/termhooks.h
index 86e9fd3469..cce8f37f99 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Miscellanea. */
diff --git a/src/terminfo.c b/src/terminfo.c
index 52acc5bdb4..8f040d10c6 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include "lisp.h"
diff --git a/src/termopts.h b/src/termopts.h
index 10f0083a66..94d3f3bb9d 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Nonzero means flash the screen instead of ringing the bell. */
diff --git a/src/textprop.c b/src/textprop.c
index e6dd411dcc..718051e38f 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include "lisp.h"
diff --git a/src/tparam.c b/src/tparam.c
index ea20869216..e05f01f491 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -13,8 +13,8 @@ GNU General Public License for more details.
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. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H
diff --git a/src/uaf.h b/src/uaf.h
index ae364b5f5e..71ae726714 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
* User Authorization File record formats
diff --git a/src/undo.c b/src/undo.c
index b4e16bfd0e..13ee40130a 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/unexaix.c b/src/unexaix.c
index 825209a5b3..4c9f2727e8 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
diff --git a/src/unexalpha.c b/src/unexalpha.c
index 97f8f383dd..aa32f411fc 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/unexapollo.c b/src/unexapollo.c
index adf72bb4f7..d9bff96369 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by Leonard N. Zubkoff. */
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 10c0dfa953..cbd1dd29fd 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -23,8 +23,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* modified for C-1 arch by jthomp@convex 871103 */
diff --git a/src/unexcw.c b/src/unexcw.c
index 046c8f796e..77d5866136 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <lisp.h>
diff --git a/src/unexec.c b/src/unexec.c
index 156cad16f9..bf231b0062 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/*
diff --git a/src/unexelf.c b/src/unexelf.c
index ce773190d7..9e8b827a75 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
diff --git a/src/unexenix.c b/src/unexenix.c
index a6d045d2e4..94ac3eb821 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -22,8 +22,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 1a2c211a09..a191c0721e 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Andrew Choi ([email protected]). */
diff --git a/src/unexmips.c b/src/unexmips.c
index de3368ad18..53b40f6274 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -22,8 +22,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/unexnext.c b/src/unexnext.c
index 50a0448d7b..2a0b66bc86 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#undef __STRICT_BSD__
diff --git a/src/unexsni.c b/src/unexsni.c
index a99d51bc0c..0c67af899d 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 4534a32c32..9ad06b6ada 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Contributed by Viktor Dukhovni. */
/*
diff --git a/src/unexw32.c b/src/unexw32.c
index ebeb735567..5380ca5c8f 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Geoff Voelker ([email protected]) 8-12-94
*/
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 0dc89098af..1840eb61c0 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef emacs
#include <config.h>
diff --git a/src/w16select.c b/src/w16select.c
index 7fb0534f36..406f0a1b88 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* These functions work by using WinOldAp interface. WinOldAp
(WINOLDAP.MOD) is a Microsoft Windows extension supporting
diff --git a/src/w32.c b/src/w32.c
index 1585b3eaf1..7795903791 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Geoff Voelker ([email protected]) 7-29-94
*/
diff --git a/src/w32.h b/src/w32.h
index 79a78a5a54..622a2256f0 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* File descriptor set emulation. */
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 8d57cbd352..e8612c7b5d 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Based heavily on code by H. Miyashita for Meadow (a descendant of
MULE for W32). */
diff --git a/src/w32bdf.h b/src/w32bdf.h
index 23939bfd7d..ca8a5f368c 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Based heavily on code by H. Miyashita for Meadow (a descendant of
MULE for W32). */
diff --git a/src/w32console.c b/src/w32console.c
index a77dc79230..70578f58c6 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Tim Fleehart ([email protected]) 1-17-92
Geoff Voelker ([email protected]) 9-12-93
diff --git a/src/w32fns.c b/src/w32fns.c
index 36131f2d1d..eedc06dda1 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Added by Kevin Gallo */
diff --git a/src/w32gui.h b/src/w32gui.h
index 04182c6da8..1fd145cd02 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_W32GUI_H
#define EMACS_W32GUI_H
diff --git a/src/w32heap.c b/src/w32heap.c
index 4c28718a51..7de08bb2b4 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Geoff Voelker ([email protected]) 7-29-94
*/
diff --git a/src/w32heap.h b/src/w32heap.h
index 556c7fb28b..259d0bf9ed 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Geoff Voelker ([email protected]) 7-29-94
*/
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 8dd4f40688..cc7c5e1e61 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Drew Bliss 01-Oct-93
Adapted from ntkbd.c by Tim Fleehart
diff --git a/src/w32inevt.h b/src/w32inevt.h
index fb61cb0ef5..f811c96c31 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef EMACS_W32INEVT_H
#define EMACS_W32INEVT_H
diff --git a/src/w32menu.c b/src/w32menu.c
index c5af0aae98..065355f875 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/w32proc.c b/src/w32proc.c
index 48b5e2c14a..0e3f8f2fd4 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Drew Bliss Oct 14, 1993
Adapted from alarm.c by Tim Fleehart
diff --git a/src/w32reg.c b/src/w32reg.c
index 97abbed5d2..a70835ac30 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by Kevin Gallo */
diff --git a/src/w32select.c b/src/w32select.c
index e562dc7efb..db29c07814 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by Kevin Gallo, Benjamin Riefenstahl */
diff --git a/src/w32term.c b/src/w32term.c
index 9e6f50e9c2..abf8e377ef 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/w32term.h b/src/w32term.h
index db7e6760ee..1557a45653 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Added by Kevin Gallo */
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 9f9a64558f..ba705d9498 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <signal.h>
diff --git a/src/widget.c b/src/widget.c
index 57eef4059e..fdd927cb17 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Emacs 19 face widget ported by Fred Pierresteguy */
diff --git a/src/widget.h b/src/widget.h
index c5d4f597ea..174a6a720d 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Emacs 19 face widget ported by Fred Pierresteguy */
diff --git a/src/widgetprv.h b/src/widgetprv.h
index b75ef76902..ce087e825c 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Emacs 19 face widget ported by Fred Pierresteguy */
diff --git a/src/window.c b/src/window.c
index 38d680fbc7..68b2d4f89c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/window.h b/src/window.h
index 493b5aa948..7e34ddee26 100644
--- a/src/window.h
+++ b/src/window.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifndef WINDOW_H_INCLUDED
#define WINDOW_H_INCLUDED
diff --git a/src/xdisp.c b/src/xdisp.c
index 40eaaa4677..a1ff09739d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* New redisplay written by Gerd Moellmann <[email protected]>.
diff --git a/src/xfaces.c b/src/xfaces.c
index b16b7eae82..0667d3823c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* New face implementation by Gerd Moellmann <[email protected]>. */
diff --git a/src/xfns.c b/src/xfns.c
index a8fa726f23..9623ea13ee 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
diff --git a/src/xmenu.c b/src/xmenu.c
index 194168e6df..321e6deb7c 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* X pop-up deck-of-cards menu facility for GNU Emacs.
*
diff --git a/src/xrdb.c b/src/xrdb.c
index 957227b794..248e5eba64 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Written by jla, 4/90 */
diff --git a/src/xselect.c b/src/xselect.c
index c60c12c3b6..9d5bf56823 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Rewritten by jwz */
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 27ab90c543..3c1231e173 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
diff --git a/src/xterm.c b/src/xterm.c
index 1a52e0e589..57a09c8c49 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* New display code by Gerd Moellmann <[email protected]>. */
/* Xt features made by Fred Pierresteguy. */
diff --git a/src/xterm.h b/src/xterm.h
index 85cfe94258..b05efa3274 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <X11/Xlib.h>
#include <X11/cursorfont.h>