summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLute Kamstra <lute@gnu.org>2005-07-04 23:32:44 +0000
committerLute Kamstra <lute@gnu.org>2005-07-04 23:32:44 +0000
commit086add1519b5c5a69a1a35aadbfd4d7cc6a2b294 (patch)
treeef6716dcd345c7d2342800dfc9a466b8aa144a42 /lisp
parenta587bb3c7e9074828d49c31c1b04ae1386041f02 (diff)
downloademacs-086add1519b5c5a69a1a35aadbfd4d7cc6a2b294.tar.gz
Update FSF's address.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/Makefile.in4
-rw-r--r--lisp/abbrev.el4
-rw-r--r--lisp/abbrevlist.el4
-rw-r--r--lisp/add-log.el4
-rw-r--r--lisp/align.el4
-rw-r--r--lisp/allout.el4
-rw-r--r--lisp/ansi-color.el4
-rw-r--r--lisp/apropos.el4
-rw-r--r--lisp/arc-mode.el4
-rw-r--r--lisp/array.el4
-rw-r--r--lisp/autoarg.el4
-rw-r--r--lisp/autoinsert.el4
-rw-r--r--lisp/autorevert.el4
-rw-r--r--lisp/avoid.el4
-rw-r--r--lisp/battery.el4
-rw-r--r--lisp/bindings.el4
-rw-r--r--lisp/bookmark.el4
-rw-r--r--lisp/bs.el4
-rw-r--r--lisp/buff-menu.el4
-rw-r--r--lisp/button.el4
-rw-r--r--lisp/calculator.el4
-rw-r--r--lisp/case-table.el4
-rw-r--r--lisp/cdl.el4
-rw-r--r--lisp/chistory.el4
-rw-r--r--lisp/cmuscheme.el4
-rw-r--r--lisp/comint.el4
-rw-r--r--lisp/compare-w.el4
-rw-r--r--lisp/complete.el4
-rw-r--r--lisp/completion.el4
-rw-r--r--lisp/composite.el4
-rw-r--r--lisp/cus-dep.el4
-rw-r--r--lisp/cus-edit.el4
-rw-r--r--lisp/cus-face.el4
-rw-r--r--lisp/cus-start.el4
-rw-r--r--lisp/cus-theme.el4
-rw-r--r--lisp/custom.el4
-rw-r--r--lisp/cvs-status.el4
-rw-r--r--lisp/dabbrev.el4
-rw-r--r--lisp/delim-col.el4
-rw-r--r--lisp/delsel.el4
-rw-r--r--lisp/descr-text.el4
-rw-r--r--lisp/desktop.el4
-rw-r--r--lisp/diff-mode.el4
-rw-r--r--lisp/diff.el4
-rw-r--r--lisp/dired-aux.el4
-rw-r--r--lisp/dired-x.el4
-rw-r--r--lisp/dired.el4
-rw-r--r--lisp/dirtrack.el4
-rw-r--r--lisp/disp-table.el4
-rw-r--r--lisp/dnd.el4
-rw-r--r--lisp/dos-fns.el4
-rw-r--r--lisp/dos-vars.el4
-rw-r--r--lisp/dos-w32.el4
-rw-r--r--lisp/double.el4
-rw-r--r--lisp/ebuff-menu.el4
-rw-r--r--lisp/echistory.el4
-rw-r--r--lisp/ediff-diff.el4
-rw-r--r--lisp/ediff-help.el4
-rw-r--r--lisp/ediff-hook.el4
-rw-r--r--lisp/ediff-init.el4
-rw-r--r--lisp/ediff-merg.el4
-rw-r--r--lisp/ediff-mult.el4
-rw-r--r--lisp/ediff-ptch.el4
-rw-r--r--lisp/ediff-util.el4
-rw-r--r--lisp/ediff-vers.el4
-rw-r--r--lisp/ediff-wind.el4
-rw-r--r--lisp/ediff.el4
-rw-r--r--lisp/edmacro.el4
-rw-r--r--lisp/ehelp.el4
-rw-r--r--lisp/electric.el4
-rw-r--r--lisp/elide-head.el4
-rw-r--r--lisp/emacs-lock.el4
-rw-r--r--lisp/env.el4
-rw-r--r--lisp/expand.el4
-rw-r--r--lisp/facemenu.el4
-rw-r--r--lisp/faces.el4
-rw-r--r--lisp/ffap.el4
-rw-r--r--lisp/filecache.el4
-rw-r--r--lisp/files.el4
-rw-r--r--lisp/find-dired.el4
-rw-r--r--lisp/find-file.el4
-rw-r--r--lisp/find-lisp.el4
-rw-r--r--lisp/finder.el4
-rw-r--r--lisp/flow-ctrl.el4
-rw-r--r--lisp/foldout.el4
-rw-r--r--lisp/follow.el4
-rw-r--r--lisp/font-core.el4
-rw-r--r--lisp/font-lock.el4
-rw-r--r--lisp/format.el4
-rw-r--r--lisp/forms.el4
-rw-r--r--lisp/frame.el4
-rw-r--r--lisp/fringe.el4
-rw-r--r--lisp/generic-x.el4
-rw-r--r--lisp/gs.el4
-rw-r--r--lisp/help-at-pt.el4
-rw-r--r--lisp/help-fns.el4
-rw-r--r--lisp/help-macro.el4
-rw-r--r--lisp/help-mode.el4
-rw-r--r--lisp/help.el4
-rw-r--r--lisp/hexl.el4
-rw-r--r--lisp/hi-lock.el4
-rw-r--r--lisp/hilit-chg.el4
-rw-r--r--lisp/hippie-exp.el4
-rw-r--r--lisp/hl-line.el4
-rw-r--r--lisp/ibuf-ext.el4
-rw-r--r--lisp/ibuf-macs.el4
-rw-r--r--lisp/ibuffer.el4
-rw-r--r--lisp/icomplete.el4
-rw-r--r--lisp/ido.el4
-rw-r--r--lisp/ielm.el4
-rw-r--r--lisp/iimage.el4
-rw-r--r--lisp/image-file.el4
-rw-r--r--lisp/image-mode.el4
-rw-r--r--lisp/image.el4
-rw-r--r--lisp/imenu.el4
-rw-r--r--lisp/indent.el4
-rw-r--r--lisp/info-look.el4
-rw-r--r--lisp/info-xref.el4
-rw-r--r--lisp/info.el4
-rw-r--r--lisp/informat.el4
-rw-r--r--lisp/international/titdic-cnv.el4
-rw-r--r--lisp/isearch.el4
-rw-r--r--lisp/isearchb.el4
-rw-r--r--lisp/iswitchb.el4
-rw-r--r--lisp/jit-lock.el4
-rw-r--r--lisp/jka-cmpr-hook.el4
-rw-r--r--lisp/jka-compr.el4
-rw-r--r--lisp/kermit.el4
-rw-r--r--lisp/kmacro.el4
-rw-r--r--lisp/ledit.el4
-rw-r--r--lisp/loadhist.el4
-rw-r--r--lisp/loadup.el4
-rw-r--r--lisp/locate.el4
-rw-r--r--lisp/log-edit.el4
-rw-r--r--lisp/log-view.el4
-rw-r--r--lisp/longlines.el4
-rw-r--r--lisp/lpr.el4
-rw-r--r--lisp/ls-lisp.el4
-rw-r--r--lisp/macros.el4
-rw-r--r--lisp/makefile.w32-in4
-rw-r--r--lisp/makesum.el4
-rw-r--r--lisp/man.el4
-rw-r--r--lisp/master.el4
-rw-r--r--lisp/menu-bar.el4
-rw-r--r--lisp/midnight.el4
-rw-r--r--lisp/minibuf-eldef.el4
-rw-r--r--lisp/misc.el4
-rw-r--r--lisp/mouse-copy.el4
-rw-r--r--lisp/mouse-drag.el4
-rw-r--r--lisp/mouse-sel.el4
-rw-r--r--lisp/mouse.el4
-rw-r--r--lisp/msb.el4
-rw-r--r--lisp/mwheel.el4
-rw-r--r--lisp/newcomment.el4
-rw-r--r--lisp/novice.el4
-rw-r--r--lisp/outline.el4
-rw-r--r--lisp/paren.el4
-rw-r--r--lisp/paths.el4
-rw-r--r--lisp/pcmpl-cvs.el4
-rw-r--r--lisp/pcmpl-gnu.el4
-rw-r--r--lisp/pcmpl-linux.el4
-rw-r--r--lisp/pcmpl-rpm.el4
-rw-r--r--lisp/pcmpl-unix.el4
-rw-r--r--lisp/pcomplete.el4
-rw-r--r--lisp/pcvs-defs.el4
-rw-r--r--lisp/pcvs-info.el4
-rw-r--r--lisp/pcvs-parse.el4
-rw-r--r--lisp/pcvs-util.el4
-rw-r--r--lisp/pcvs.el4
-rw-r--r--lisp/printing.el2
-rw-r--r--lisp/ps-bdf.el4
-rw-r--r--lisp/ps-mule.el4
-rw-r--r--lisp/ps-print.el2
-rw-r--r--lisp/recentf.el4
-rw-r--r--lisp/rect.el4
-rw-r--r--lisp/register.el4
-rw-r--r--lisp/repeat.el4
-rw-r--r--lisp/replace.el4
-rw-r--r--lisp/reposition.el4
-rw-r--r--lisp/resume.el4
-rw-r--r--lisp/reveal.el4
-rw-r--r--lisp/rfn-eshadow.el4
-rw-r--r--lisp/rot13.el4
-rw-r--r--lisp/ruler-mode.el4
-rw-r--r--lisp/s-region.el4
-rw-r--r--lisp/saveplace.el4
-rw-r--r--lisp/scroll-all.el4
-rw-r--r--lisp/scroll-bar.el4
-rw-r--r--lisp/select.el4
-rw-r--r--lisp/server.el4
-rw-r--r--lisp/ses.el4
-rw-r--r--lisp/shadowfile.el4
-rw-r--r--lisp/shell.el4
-rw-r--r--lisp/simple.el4
-rw-r--r--lisp/skeleton.el4
-rw-r--r--lisp/smerge-mode.el4
-rw-r--r--lisp/sort.el4
-rw-r--r--lisp/soundex.el4
-rw-r--r--lisp/speedbar.el4
-rw-r--r--lisp/startup.el4
-rw-r--r--lisp/strokes.el4
-rw-r--r--lisp/subr.el4
-rw-r--r--lisp/tabify.el4
-rw-r--r--lisp/talk.el4
-rw-r--r--lisp/tar-mode.el4
-rw-r--r--lisp/tempo.el4
-rw-r--r--lisp/term.el4
-rw-r--r--lisp/terminal.el4
-rw-r--r--lisp/textmodes/page-ext.el4
-rw-r--r--lisp/thumbs.el4
-rw-r--r--lisp/time-stamp.el4
-rw-r--r--lisp/time.el4
-rw-r--r--lisp/timezone.el4
-rw-r--r--lisp/tmm.el4
-rw-r--r--lisp/toolbar/tool-bar.el4
-rw-r--r--lisp/tooltip.el4
-rw-r--r--lisp/tree-widget.el4
-rw-r--r--lisp/type-break.el4
-rw-r--r--lisp/uniquify.el4
-rw-r--r--lisp/userlock.el4
-rw-r--r--lisp/vc-arch.el4
-rw-r--r--lisp/vc-cvs.el4
-rw-r--r--lisp/vc-hooks.el4
-rw-r--r--lisp/vc-mcvs.el4
-rw-r--r--lisp/vc-rcs.el4
-rw-r--r--lisp/vc-sccs.el4
-rw-r--r--lisp/vc-svn.el4
-rw-r--r--lisp/vc.el4
-rw-r--r--lisp/vcursor.el4
-rw-r--r--lisp/version.el4
-rw-r--r--lisp/view.el4
-rw-r--r--lisp/vms-patch.el4
-rw-r--r--lisp/vmsproc.el4
-rw-r--r--lisp/vt-control.el4
-rw-r--r--lisp/vt100-led.el4
-rw-r--r--lisp/w32-fns.el4
-rw-r--r--lisp/w32-vars.el4
-rw-r--r--lisp/wdired.el4
-rw-r--r--lisp/whitespace.el4
-rw-r--r--lisp/wid-browse.el4
-rw-r--r--lisp/wid-edit.el4
-rw-r--r--lisp/widget.el4
-rw-r--r--lisp/windmove.el4
-rw-r--r--lisp/window.el4
-rw-r--r--lisp/winner.el4
-rw-r--r--lisp/woman.el4
-rw-r--r--lisp/x-dnd.el4
-rw-r--r--lisp/xml.el4
-rw-r--r--lisp/xt-mouse.el4
249 files changed, 496 insertions, 496 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 593dcc7fc3f..1174519af9a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
SHELL = /bin/sh
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 0a40768af31..b63814e922a 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index 9c8b0e0d583..a193a92df0f 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 72eda86f131..ec802ef4ae7 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/align.el b/lisp/align.el
index 563e839f5fe..5c1e8e7b89a 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/allout.el b/lisp/allout.el
index 6fb81f9f6f7..518e37083e0 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 9b36a403b5d..31aaef2fcdc 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -21,8 +21,8 @@
;;
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 9ac6d32300d..37cb85494ab 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index b6a969d6c0a..b049f8ea734 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/array.el b/lisp/array.el
index 2f270d0f086..836ba99ff6d 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 78e71ef2186..ae1d26ecd20 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index b7515070339..71fa14014a9 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -198,8 +198,8 @@ If this contains a %s, that will be replaced by the matching rule."
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 1769a992f7b..23156ceda47 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/avoid.el b/lisp/avoid.el
index b5e7d1f9b62..032c7260cec 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/battery.el b/lisp/battery.el
index 6e94c176513..cd6f7933c4e 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 7461b185bba..1e19592500b 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b89773d12c7..51a5e0469e5 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/bs.el b/lisp/bs.el
index 4c8b74bb59f..67db5648893 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 79247ad30df..7f10e7f3c1f 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/button.el b/lisp/button.el
index 78008f06db2..1b0c009e925 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -19,8 +19,8 @@
;;
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 0c6ad53dbce..923d4022098 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
;;;=====================================================================
;;; Commentary:
diff --git a/lisp/case-table.el b/lisp/case-table.el
index e9697655f38..31c26949281 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 53c9ced9cec..68111eda53e 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/chistory.el b/lisp/chistory.el
index ddbc0863a0e..1704e7a4a1e 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 03cd8ee4d9c..102347f345a 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/comint.el b/lisp/comint.el
index e751926912f..188af8a3b0b 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 353c015c8af..e0a6d5cf732 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/complete.el b/lisp/complete.el
index 60bddd01f17..dabab4ee6ee 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/completion.el b/lisp/completion.el
index d7f728821f9..5e7285ecddd 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/composite.el b/lisp/composite.el
index 4f9faf2ccfa..5fd6b6529e0 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index bd9fd71b579..8818ed6ff70 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 4889ec6d62d..76e8e5bf7ba 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 2a0198689de..6eaaf97288d 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index db14975a480..7c10b57a1b2 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 480743e70f2..32e01963824 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
diff --git a/lisp/custom.el b/lisp/custom.el
index cb4e76dd65a..a8c9b864537 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index c8bd1e7e905..a70e368ff89 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index cbb2526c852..01591e2fdf3 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 04cd90961a1..1c0c8b77503 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 962fa156a07..483c2e2c599 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index ce46b3f828d..3c548458713 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 8e81e8826fe..02616d23f5e 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index b9c9e338388..b6444aad2a4 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/diff.el b/lisp/diff.el
index c985b66036e..bee7277af78 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b517dffe9f7..c9d5c22ded3 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 86c955650e8..42df15b47d2 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dired.el b/lisp/dired.el
index a13a9e54ebe..a2d1cf957a8 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 41aea04988b..5ae76f91316 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 87781f5f8ae..0d0f4e4e09a 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 96c9e18a3f1..9a925550411 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 1253b7b5811..920625526e3 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 93ff681796e..8fdff647bed 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index d7b411fab3f..644b457393f 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/double.el b/lisp/double.el
index c9c27203344..137ea510123 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index ec230bc8a62..2a89d4ef654 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/echistory.el b/lisp/echistory.el
index a01cad89f40..e134b16ce6c 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 4e495d6d32b..659c4ffedb0 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 69d170faedf..87056e3723f 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 5394923aa36..8d038a4d93b 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 4863c255830..18e1a7128f1 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 237ce514cbb..13414747b11 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 3616bb267ce..c7ad411b4ac 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 4040985d1c8..45b214c0cb3 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index b7b39f405e5..9434601326c 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index effce2a1adf..653f4017cad 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index c43307938fc..3ac4ee089cd 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 3a40aafda55..46b060e29ae 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -24,8 +24,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 939e275f1b9..4ab7c7b1029 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 82a8e10301e..36bbd0329bb 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/electric.el b/lisp/electric.el
index 18a4d8388c5..32fb843e2cb 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index fed6ecee7af..f47e9e871ea 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 26ed4ffa39e..479cc4f2ede 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/env.el b/lisp/env.el
index 3d92501279e..606aa163c87 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/expand.el b/lisp/expand.el
index 2e2767289ce..e0ebad49caa 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 6dc6124af5d..55ddf663b28 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/faces.el b/lisp/faces.el
index cad2e932519..35ec7ad24a5 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 89e04c0f2bd..e30b859a588 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 90287ba5eef..9fccba4b84b 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/files.el b/lisp/files.el
index 2504dd2d129..1840d3e5f06 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index d52305a500a..e1b4ce65e71 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 69cafbc75b1..d741ed7d845 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index f8130043177..35b24af3d6b 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/finder.el b/lisp/finder.el
index fb327524793..01052101e6d 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 63654572f9b..0bfc5c7e92e 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 10f3cecd3ee..9c6ef395ab5 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/follow.el b/lisp/follow.el
index 74dc12f8881..09b408cb452 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/font-core.el b/lisp/font-core.el
index a78e21a762f..318191e1757 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index cbde7926cac..a1b30292e61 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/format.el b/lisp/format.el
index 62b957452b0..e676677179b 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/forms.el b/lisp/forms.el
index d1c5b0c5fd9..7b41698cf4f 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/frame.el b/lisp/frame.el
index 6b69dead414..088a7a9b622 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 3c554f1ca55..71914bd95f3 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index fcf5b6c0e1d..55afcc73e62 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/gs.el b/lisp/gs.el
index 2c38a55f6df..7a8fb807ccd 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 00c62abe9ca..f3321e437de 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index ab9e118bfdf..6160391df95 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 3a7cf0898cb..cf3e63d8d76 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index cd8c6a1c2dc..3349bc058f3 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/help.el b/lisp/help.el
index 3323c329c97..bab0592160c 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/hexl.el b/lisp/hexl.el
index e24f6b7f72b..894633a1f34 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index a924c89ba37..c649ed8d465 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index b6bfb297313..59468147cb7 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index bd726564da6..cdbc03bd1f7 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index e553636674b..85617eab680 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 87d9eb707eb..9aef1ed95be 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with this program ; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index effcafd9240..aebe923ee85 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with this program ; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 217696cb4aa..dd0fba20914 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with this program ; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index ca94ca0d3db..9e9662c1697 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ido.el b/lisp/ido.el
index f5941bf4ef2..d4d94164f3c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Acknowledgements
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 727face3695..66a1da39066 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 32f6aef9abd..b10679592b3 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 11676021afd..8f74dd63c0a 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b29027fcf42..4999a880dfc 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/image.el b/lisp/image.el
index b7b2d9988a8..561e0ac0abf 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 2248ece3dbd..a210b39c604 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/indent.el b/lisp/indent.el
index 11f01068397..14488e79a62 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 4fc2c6b4c63..a408a7b2388 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index ab9b26c10dd..bffe5681cd0 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/info.el b/lisp/info.el
index 6bb8252f003..695d67c3647 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/informat.el b/lisp/informat.el
index acfb093c064..f3688cb3668 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index bb055b7bdb3..55a4b4ac6ad 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -696,7 +696,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
;; #
;; # You should have received a copy of the GNU General Public License
;; # along with this program; if not, write to the Free Software Foundation,
-;; # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.")
+;; # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
("chinese-ctlaub" "$(0N,Gn(B"
"CTLau-b5.html" big5 "CTLau-b5.el"
@@ -722,7 +722,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
;; #
;; # You should have received a copy of the GNU General Public License
;; # along with this program; if not, write to the Free Software Foundation,
-;; # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.")
+;; # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
))
;; Generate a code of a Quail package in the current buffer from Tsang
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a8718836c58..58c8fd5829a 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index dbcbb1b7af2..3665311aaf6 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index d705faf9708..408b17c9332 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index ba2eed9f17e..d98e8791124 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 62d83f9e93e..36775a25470 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index f282957512c..db18903e21f 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/kermit.el b/lisp/kermit.el
index cf56a6216bb..1b22df1dbe2 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 6aaa8c8f224..28e2c17c2a8 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 565550efe47..cab3c6c7d6c 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index da6fd695da3..bcdf47387da 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/loadup.el b/lisp/loadup.el
index f3a793b252c..26070965994 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/locate.el b/lisp/locate.el
index 30a6ff41df3..4289d3e975c 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 0d84ecd0504..a3876df8cce 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 302246e2f4c..66e8b27c0ff 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/longlines.el b/lisp/longlines.el
index c6de1d2347e..5d68c0a06a3 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 445c793fcdd..5714c746631 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 2e163270f90..dee98a87823 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/macros.el b/lisp/macros.el
index 41024e4e40f..79471ed905c 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index ce451560bc4..8c6007af558 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/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 =
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 21a69d5f541..985012f90d1 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/man.el b/lisp/man.el
index 0037d132624..cb62aa65e94 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/master.el b/lisp/master.el
index b9908e82b55..bdc5144d63c 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index f8aaf2de77c..b6230189cc5 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;; Avishai Yacobi suggested some menu rearrangements.
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 83b21dda7e4..8bc00b83103 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 908b77aab33..f3b08be702f 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/misc.el b/lisp/misc.el
index 31a35affad0..c081a8cd8c4 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 528cfb8d824..6279d4e1f46 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 9906114ca30..6971bdb9a89 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 4cabafe737d..1a271a5ab7d 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 03740e780d5..4fd81ced998 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/msb.el b/lisp/msb.el
index 02ab487bc69..945535267ff 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 231b7c3d6e3..27116c75e98 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 590e6ce37ba..c0ad722c158 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/novice.el b/lisp/novice.el
index 171285ca3f1..6fd67d4ac1e 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/outline.el b/lisp/outline.el
index 62d2e57933f..6b662664b58 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/paren.el b/lisp/paren.el
index 7c6abe087b9..f0bf458a3ab 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/paths.el b/lisp/paths.el
index e3fac711b43..b79e925aee3 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 805f42ea41a..54ab07e6e85 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 32810d7dba6..36713323075 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -16,8 +16,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 1822b514c41..bb77bf00231 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -16,8 +16,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index e4d6ebc1a80..50c4906886f 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -16,8 +16,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index fe26b089f77..edbc1b28586 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -16,8 +16,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index b01bef39664..3f0ffc54eeb 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 394c3580945..1e4c29f5583 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index d56fa19fd32..0a48fc7d8e7 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 7ab6c53b4a0..1b08473d305 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 2cbb00b324c..9531f06b3c6 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index be93104a33f..34a93a1d659 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -29,8 +29,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/printing.el b/lisp/printing.el
index 2dbe460c0cc..c73242961cf 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -31,7 +31,7 @@ Please send all bug fixes and enhancements to
;; You should have received a copy of the GNU General Public License along with
;; GNU Emacs; see the file COPYING. If not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index a6675f9b811..056438a2bc5 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index ba858959cc3..3f28771f3a0 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -24,8 +24,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 79215f2a8ad..484c207e074 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -38,7 +38,7 @@ Please send all bug fixes and enhancements to
;; You should have received a copy of the GNU General Public License along with
;; GNU Emacs; see the file COPYING. If not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 64af3b1da3f..57280a7b4bc 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/rect.el b/lisp/rect.el
index e53198bc753..08b601c050e 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/register.el b/lisp/register.el
index eaa53446c56..4789047b0af 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 5f0811d355c..b1b8cc40aa8 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/replace.el b/lisp/replace.el
index 3b93761a0cc..4b745d54433 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 8dc752c2357..41283ce251a 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/resume.el b/lisp/resume.el
index 4a131034e51..db21a4bab4c 100644
--- a/lisp/resume.el
+++ b/lisp/resume.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/reveal.el b/lisp/reveal.el
index c08f9b604cb..402fa7c4f49 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 84731115d1a..5c7865d864f 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/rot13.el b/lisp/rot13.el
index bcf4252d142..99b34ef9d17 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 9e85b7846ca..783e511d0b2 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/s-region.el b/lisp/s-region.el
index 4153174ee24..d3fa6b1f307 100644
--- a/lisp/s-region.el
+++ b/lisp/s-region.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 34c88a89948..afb10ede9d5 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 287ed3ba472..2c0636d69d2 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;; This mode allows multiple buffers to be 'locked' so that scrolling
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 2d2921e9fc9..64429ba4da5 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/select.el b/lisp/select.el
index 565ddd7d22e..46f9fd7fab3 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/server.el b/lisp/server.el
index 0a5fc942206..73878d8435b 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/ses.el b/lisp/ses.el
index bad396bbe94..f7de1ddb50a 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 653c1e7f042..2e5943db0f5 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/shell.el b/lisp/shell.el
index a8f4790a054..2684ee30a65 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/simple.el b/lisp/simple.el
index d0dcbbfc42c..b5e7d188695 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 5f25e881218..f854621cc85 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9e129c3571d..45e68750cb3 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/sort.el b/lisp/sort.el
index d90369cabcd..e2fe806c430 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/soundex.el b/lisp/soundex.el
index fb9d72f8fa9..2ed79b29455 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index a01b9ddb47e..188304bce74 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/startup.el b/lisp/startup.el
index 0b3f5ddbc10..83b8729e202 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 396a44cec24..bb99591d1e1 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/subr.el b/lisp/subr.el
index d489000f7e7..c0405f46011 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tabify.el b/lisp/tabify.el
index a28f0d6ccd2..78ee80bee1b 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/talk.el b/lisp/talk.el
index bbe9c949dde..d2436e59ff2 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 51042f8aa54..041f0fddc1a 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 49a73ef1098..3f5687d0d08 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/term.el b/lisp/term.el
index 122953af124..047db5708af 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Marck 13 2001
;;; Fixes for CJK support by Yong Lu <lyongu@yahoo.com>.
diff --git a/lisp/terminal.el b/lisp/terminal.el
index afce6f51287..d9ba5d3f728 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 0b2b1477f80..c8828e1a6d5 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -120,8 +120,8 @@
;;
;; FSF
;; Free Software Foundation
-;; 59 Temple Place - Suite 330
-;; Boston, MA 02111-1307 USA.
+;; 51 Franklin Street, Fifth Floor
+;; Boston, MA 02110-1301 USA.
;; (617) 542-5942
;; gnu@gnu.org
;;
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 09fe77cf352..478fb0b6528 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;
;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
;; The peoples at #emacs@freenode.net for numerous help
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 4cba3b5f456..5b763d2f0ff 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/time.el b/lisp/time.el
index f6ddced4d38..a6a4d771a2c 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 62c8f86f79b..cd6e3ce769f 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tmm.el b/lisp/tmm.el
index aa47012c642..a55b11b17f6 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 5f2e3afd46c..45c51532c9f 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 6b78acd0597..fabb154d7ed 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 76d89afca87..407fb65ea49 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 0585e5bc61d..4545351f5a9 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index e9b8b1e1da2..9e241a55f8b 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/userlock.el b/lisp/userlock.el
index e6e5ef0a1b5..5e2f337db07 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 569f864c0ea..d59e7143179 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index e4e9f0b0137..16759351407 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 52b4659cec6..5e8bf4f523c 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index eef01f2aad5..e324cb7eb1c 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 6e6bb04c2ec..e591baf3a26 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index b691775f63b..c4a48274e36 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -22,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index b6e3ac29568..9e0b3414a04 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vc.el b/lisp/vc.el
index b89298604eb..d4ece57a3d6 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Credits:
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index ac04603dbf8..fd7d1416661 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/version.el b/lisp/version.el
index d2d45a361f7..05fdde95221 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/view.el b/lisp/view.el
index e184d68b117..c327dcdaa36 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index d8d44d9d752..886b8572e77 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el
index da8715e860d..9871daa7a5e 100644
--- a/lisp/vmsproc.el
+++ b/lisp/vmsproc.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index edc4f927346..ed65c93290f 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index d78960a5785..805746dd495 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 86703a3b9b5..28f268bf623 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 30dae3f9987..5c6741a3f3e 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/wdired.el b/lisp/wdired.el
index a82176af5e8..c22a8dff633 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index a119793c3a9..f1255df9482 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index 57c4ebdb548..17fe9c24214 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b582ca6854a..062a7886789 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Wishlist items (from widget.texi):
diff --git a/lisp/widget.el b/lisp/widget.el
index f7e7d5d899c..f6c8efa6374 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 986280c0bb1..785a7538a69 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -20,8 +20,8 @@
;;
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;
;; --------------------------------------------------------------------
diff --git a/lisp/window.el b/lisp/window.el
index 75052f9a5f1..c31b3149556 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/winner.el b/lisp/winner.el
index 603eb80d9f0..c64d00d6255 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/woman.el b/lisp/woman.el
index b1f8581ab9c..9ad3b50e381 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -23,8 +23,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 78a41d54625..0a4017a7b7c 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -21,8 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/xml.el b/lisp/xml.el
index f4300817836..53cf850b983 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 797893c8f2b..e8b0cee00e4 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary: