diff --git a/Demo/parser/FILES b/Demo/parser/FILES
index 4505d3a..1ff59a3 100644
--- a/Demo/parser/FILES
+++ b/Demo/parser/FILES
@@ -1,4 +1,4 @@
-Demo/parser/
+Demo/parser
 Doc/libparser.tex
 Lib/AST.py
 Lib/symbol.py
diff --git a/Demo/parser/Makefile b/Demo/parser/Makefile
index d71e811..0d02215 100644
--- a/Demo/parser/Makefile
+++ b/Demo/parser/Makefile
@@ -1,6 +1,24 @@
 parser.dvi:  parser.tex ../../Doc/libparser.tex
 	TEXINPUTS=../../Doc:: $(LATEX) parser
 
+parser.ps: parser.dvi
+	$(DVIPS) parser >parser.ps
+
+parser.texi: @lib.texi
+	$(EMACS) -batch -l ../../Doc/fix.el -f save-buffer -kill
+	mv @lib.texi parser.texi
+
+@lib.texi:../../Doc/libparser.tex \
+	 texipre.dat ../../Doc/texipost.dat \
+	 ../../Doc/partparse.py ../../Doc/fix.el
+	$(PYTHON) ../../Doc/partparse.py -o @lib.texi \
+		-t ../../Doc/texipost.dat \
+		../../Doc/libparser.tex
+
+parserwww: parser.texi
+	if test -d html ; then true; else mkdir html ; fi
+	$(PYTHON) ../../Doc/texi2html.py -d parser.texi html
+
 #  Use a new name for this; the included file uses 'clean' already....
 clean-parser:
 	rm -f *.log *.aux *.dvi *.pyc *.ps
diff --git a/Demo/parser/parser.tex b/Demo/parser/parser.tex
index 170d9d7..1a6b296 100644
--- a/Demo/parser/parser.tex
+++ b/Demo/parser/parser.tex
@@ -9,11 +9,11 @@
 \author{
 	Fred L. Drake, Jr. \\
 	Corporation for National Research Initiatives (CNRI) \\
-	1895 Preston White Drive, Reston, Va 20191, USA \\
+	1895 Preston White Drive, Reston, Va 20191-5343, USA \\
 	E-mail: {\tt fdrake@cnri.reston.va.us}, {\tt fdrake@intr.net}
 }
 
-\date{August 20th, 1996 \\ Release 1.4}
+\date{September 3rd, 1996 \\ Release 1.4}
 
 \begin{document}
 
@@ -21,13 +21,14 @@
 
 \maketitle
 
-Copyright \copyright{} 1995-1996 by Fred L. Drake, Jr. and Virginia
-Polytechnic Institute and State University, Blacksburg, Virginia, USA.
-Portions of the software copyright 1991-1995 by Stichting Mathematisch
-Centrum, Amsterdam, The Netherlands.  Copying is permitted under the
-terms associated with the main Python distribution, with the
-additional restriction that this additional notice be included and
-maintained on all distributed copies.
+Copyright \copyright{} 1995-1996 by Fred L. Drake, Jr., Reston,
+Virginia, USA, and Virginia Polytechnic Institute and State
+University, Blacksburg, Virginia, USA.  Portions of the software
+copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, The
+Netherlands.  Copying is permitted under the terms associated with the
+main Python distribution, with the additional restriction that this
+additional notice be included and maintained on all distributed
+copies.
 
 \begin{center}
 All Rights Reserved
@@ -62,9 +63,9 @@
 presented as a separate document.
 
 This manual assumes basic knowledge about the Python language.  For an
-informal introduction to Python, see the {\em Python Tutorial}; the
-Python Reference Manual remains the highest authority on syntactic and
-semantic questions.
+informal introduction to Python, see the \emph{Python Tutorial}; the
+\emph{Python Reference Manual} remains the highest authority on
+syntactic and semantic questions.
 
 \end{abstract}
 
diff --git a/Demo/parser/texipre.dat b/Demo/parser/texipre.dat
new file mode 100644
index 0000000..8ad03a6
--- /dev/null
+++ b/Demo/parser/texipre.dat
@@ -0,0 +1,100 @@
+\input texinfo   @c -*-texinfo-*-
+@c %**start of header
+@setfilename parser.info
+@settitle Python Parser Module Reference
+@setchapternewpage odd
+@footnotestyle end
+@c %**end of header
+
+@ifinfo
+This file describes the interfaces
+published by the optional @code{parser} module and gives examples of
+how they may be used.  It contains the same text as the chapter on the
+@code{parser} module in the @cite{Python Library Reference}, but is
+presented as a separate document.
+
+Copyright 1995-1996 by Fred L. Drake, Jr., Reston, Virginia, USA, and
+Virginia Polytechnic Institute and State University, Blacksburg,
+Virginia, USA.  Portions of the software copyright 1991-1995 by
+Stichting Mathematisch Centrum, Amsterdam, The Netherlands.  Copying is
+permitted under the terms associated with the main Python distribution,
+with the additional restriction that this additional notice be included
+and maintained on all distributed copies.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Fred L. Drake, Jr. and
+Virginia Polytechnic Institute and State University not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.
+
+FRED L. DRAKE, JR. AND VIRGINIA POLYTECHNIC INSTITUTE AND STATE
+UNIVERSITY DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FRED L. DRAKE, JR. OR VIRGINIA POLYTECHNIC INSTITUTE AND
+STATE UNIVERSITY BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+@end ifinfo
+
+@titlepage
+@title Python Parser Module Reference
+@author Fred L. Drake, Jr.
+
+@c  The following two commands start the copyright page.
+@page
+@vskip 0pt plus 1filll
+Copyright 1995-1996 by Fred L. Drake, Jr., Reston, Virginia, USA, and
+Virginia Polytechnic Institute and State University, Blacksburg,
+Virginia, USA.  Portions of the software copyright 1991-1995 by
+Stichting Mathematisch Centrum, Amsterdam, The Netherlands.  Copying is
+permitted under the terms associated with the main Python distribution,
+with the additional restriction that this additional notice be included
+and maintained on all distributed copies.
+
+@center All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Fred L. Drake, Jr. and
+Virginia Polytechnic Institute and State University not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.
+
+FRED L. DRAKE, JR. AND VIRGINIA POLYTECHNIC INSTITUTE AND STATE
+UNIVERSITY DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FRED L. DRAKE, JR. OR VIRGINIA POLYTECHNIC INSTITUTE AND
+STATE UNIVERSITY BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+@end titlepage
+
+
+@node Top, Overview, (dir), (dir)
+@top The Python Parser Module
+
+@ifinfo
+This file describes the interfaces
+published by the optional @code{parser} module and gives examples of
+how they may be used.  It contains the same text as the chapter on the
+@code{parser} module in the @cite{Python Library Reference}, but is
+presented as a separate document.
+
+This version corresponds to Python version 1.4 (1 Sept. 1996).
+
+@end ifinfo
+
+@c placeholder for the master menu -- patched by texinfo-all-menus-update
+@menu
+@end menu