31 files changed, 60 insertions, 33 deletions
diff --git a/acconfig.h b/acconfig.h
index de444f8e..658ee9d5 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,6 +1,5 @@
 #ifndef CONFIG_H
 #define CONFIG_H
-
 @TOP@
 
 /* Name of package.  */
@@ -11,7 +10,6 @@
 
 /* Define if the compiler understands prototypes.  */
 #undef PROTOTYPES
-
 @BOTTOM@
 
 #if defined(PROTOTYPES) || defined(__cplusplus)
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index e6031de3..8ffc3840 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -353,7 +353,7 @@ using the other GNU tools.
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-675 Mass Ave, Cambridge, MA 02139, USA
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -699,7 +699,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/src/LR0.c b/src/LR0.c
index 1352c33d..b44b8f3b 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* See comments in state.h for the data structures that represent it.
diff --git a/src/alloc.h b/src/alloc.h
index 47542dfa..afded9b1 100644
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define	NEW(t)		((t *) xmalloc((unsigned) sizeof(t)))
diff --git a/src/allocate.c b/src/allocate.c
index c79cae16..1175e791 100644
--- a/src/allocate.c
+++ b/src/allocate.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
diff --git a/src/bison.s1 b/src/bison.s1
index 529fa777..65870431 100644
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -17,7 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
diff --git a/src/bison.simple b/src/bison.simple
index 529fa777..65870431 100644
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -17,7 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
diff --git a/src/closure.c b/src/closure.c
index 01076946..ad349196 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* subroutines of file LR0.c.
diff --git a/src/conflicts.c b/src/conflicts.c
index cb0e67db..9be3a6c6 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include "system.h"
diff --git a/src/derives.c b/src/derives.c
index e8c70402..6002b88f 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* set_derives finds, for each variable (nonterminal), which rules can derive it.
diff --git a/src/files.c b/src/files.c
index ba51cce4..5f8fda44 100644
--- a/src/files.c
+++ b/src/files.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #if defined (VMS) & !defined (__VMS_POSIX)
diff --git a/src/files.h b/src/files.h
index 8d24890e..e72dd201 100644
--- a/src/files.h
+++ b/src/files.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* These two should be pathnames for opening the sample parser files.
diff --git a/src/getargs.c b/src/getargs.c
index 35cac38f..e337a54b 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
diff --git a/src/gram.c b/src/gram.c
index 6b487376..05dc665c 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* comments for these variables are in gram.h  */
diff --git a/src/gram.h b/src/gram.h
index 080ce0d9..a83dd36f 100644
--- a/src/gram.h
+++ b/src/gram.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* representation of the grammar rules:
diff --git a/src/lalr.c b/src/lalr.c
index dc0b043c..117f2b9f 100644
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Compute how to make the finite state machine deterministic;
diff --git a/src/lex.c b/src/lex.c
index f0fbf485..627a0bac 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
diff --git a/src/lex.h b/src/lex.h
index 6cbaebcb..99794925 100644
--- a/src/lex.h
+++ b/src/lex.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define ENDFILE		0
diff --git a/src/machine.h b/src/machine.h
index 6c05691f..738c0d20 100644
--- a/src/machine.h
+++ b/src/machine.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef	eta10
 #define	MAXSHORT	2147483647
diff --git a/src/main.c b/src/main.c
index 9bff77a2..88b0dd3b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
diff --git a/src/nullable.c b/src/nullable.c
index f931f4a9..de4551a8 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* set up nullable, a vector saying which nonterminals can expand into the null string.
diff --git a/src/output.c b/src/output.c
index d7a8301c..271bb4b5 100644
--- a/src/output.c
+++ b/src/output.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* functions to output parsing data to various files.  Entries are:
diff --git a/src/print.c b/src/print.c
index 3ea8b425..ecd5d926 100644
--- a/src/print.c
+++ b/src/print.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
diff --git a/src/reader.c b/src/reader.c
index 8db41831..33332b59 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* read in the grammar specification and record it in the format described in gram.h.
diff --git a/src/reduce.c b/src/reduce.c
index 6d811252..5e69a69b 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
diff --git a/src/state.h b/src/state.h
index 53f9d094..67b78cfc 100644
--- a/src/state.h
+++ b/src/state.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* These type definitions are used to represent a nondeterministic
diff --git a/src/symtab.c b/src/symtab.c
index 5dc1ccf0..281239c7 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
diff --git a/src/symtab.h b/src/symtab.h
index 142587c9..d831ccbb 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define	TABSIZE	1009
diff --git a/src/types.h b/src/types.h
index a4aa0a75..25cf7885 100644
--- a/src/types.h
+++ b/src/types.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 typedef
diff --git a/src/vmsgetargs.c b/src/vmsgetargs.c
index 83cb8bfc..7431c4ca 100644
--- a/src/vmsgetargs.c
+++ b/src/vmsgetargs.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <ctype.h>
diff --git a/src/warshall.c b/src/warshall.c
index dc2e3ac5..862f0eab 100644
--- a/src/warshall.c
+++ b/src/warshall.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>