15 files changed, 30 insertions, 31 deletions

diff --git a/Makefile.in b/Makefile.in
index 1b4a3d8c36b..811a8205c45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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.
 
 # make all      to compile and build Emacs.
 # make install  to install it.
diff --git a/admin/admin.el b/admin/admin.el
index 07a2bcb757e..3969345cc32 100644
--- a/admin/admin.el
+++ b/admin/admin.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/admin/alloc-colors.c b/admin/alloc-colors.c
index 0aacb687232..361b3bd2f24 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <X11/Xlib.h>
 #include <stdio.h>
diff --git a/admin/build-configs b/admin/build-configs
index 1a21b90c171..083c9e766e6 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -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.
 
 # Build Emacs in several different configurations.
 
diff --git a/admin/cus-test.el b/admin/cus-test.el
index cf00bf214fb..ff38b0b08ff 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.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/admin/diff-tar-files b/admin/diff-tar-files
index d827de3ec3e..7f27ab99876 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -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.
 
 if [ $# != 2 ]; then
     cat <<EOF
diff --git a/admin/make-emacs b/admin/make-emacs
index faa5dc2a39f..d17e59e5692 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -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.
 
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
diff --git a/admin/revdiff b/admin/revdiff
index 5c9d2251c8c..d936106aada 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -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.
 
 use File::Basename;
 
diff --git a/config.bat b/config.bat
index 9617dfb4af7..1f25bfef9eb 100644
--- a/config.bat
+++ b/config.bat
@@ -18,8 +18,8 @@ rem   GNU General Public License for more details.
 

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

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

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

-rem   Boston, MA 02111-1307, USA.

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

+rem   Boston, MA 02110-1301, USA.

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

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

 rem

diff --git a/config.guess b/config.guess
index 0149c53609b..1f1b4f23216 100755
--- a/config.guess
+++ b/config.guess
@@ -17,7 +17,7 @@ timestamp='2002-11-13'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/config.sub b/config.sub
index aeb3bd99950..11ab23c1ac3 100755
--- a/config.sub
+++ b/config.sub
@@ -21,8 +21,8 @@ timestamp='2002-11-13'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/configure.in b/configure.in
index d8ded5d08af..bc245479211 100644
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,8 @@ dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
-dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl  Boston, MA 02111-1307, USA.
+dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl  Boston, MA 02110-1301, USA.
 
 AC_PREREQ(2.54)dnl
 AC_INIT(src/lisp.h)
diff --git a/etc/INTERVIEW b/etc/INTERVIEW
index 8145da6f074..4e109ba49dd 100644
--- a/etc/INTERVIEW
+++ b/etc/INTERVIEW
@@ -412,13 +412,12 @@ BYTE: How can you get a copy of that?
 Stallman: Write to the Free Software Foundation, 675 Massachusetts Ave.,
 Cambridge, MA 02139.
 
-[In June 1995, this address changed to:
+[As of April 2005, this address is:
      Free Software Foundation
-     59 Temple Place - Suite 330
-     Boston, MA  02111-1307,  USA
+     51 Franklin Street, Fifth Floor
+     Boston, MA  02110-1301, USA
      Voice:  +1-617-542-5942
      Fax:    +1-617-542-2652
--gnu@prep.ai.mit.edu
 ]
 
 BYTE: What are you going to do when you are done with the GNU system?
diff --git a/make-dist b/make-dist
index 227c4b21640..9f2c4bb1280 100755
--- a/make-dist
+++ b/make-dist
@@ -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.
 
 progname="$0"
 
diff --git a/update-subdirs b/update-subdirs
index 7ac5977d70f..29ac404575a 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 cd $1
 for file in *; do