diff --git a/makefile b/makefile
index f856cf2..4ee4c5a 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of tperimeter using 'make'
-# $Id: makefile,v 1.102 2006/04/29 08:13:40 tundra Exp $
+# $Id: makefile,v 1.103 2006/05/01 00:07:11 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -21,8 +21,7 @@
 
 SUPPFILES = ${PROGNAME}-license.txt  CHANGELOG.txt WHATSNEW.txt
 
-DOCFILES  = ${PROGNAME}-doc.html ${PROGNAME}-doc.pdf ${PROGNAME}-doc.ps ${PROGNAME}.py.ps ${PROGNAME}-doc.txt \
-            ${PROGNAME}.1.gz
+DOCFILES  = ${PROGNAME}.html ${PROGNAME}.pdf ${PROGNAME}.ps ${PROGNAME}.py.ps ${PROGNAME}.txt 
 
 
 #####
@@ -42,15 +41,27 @@
 # Pattern Rules
 #####
 
+%.dvi: %.latex
+	latex $<
+
 %.html: %.1
 	@manserver $< >$@
 
+%.html: %.txt
+	rst2html.py $< >$@
+
+%.latex: %.txt
+	rst2latex.py $< >$@
+
 %.pdf: %.ps
 	@gs -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$@ $<
 
 %.ps: %.1
 	@groff -man -Tps $< >$@
 
+%.ps: %.dvi
+	dvips $< >$@
+
 %.py.ps: %.py
 	@enscript -Epython -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<