diff --git a/makefile b/makefile
index fc3ffb3..6f1d638 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of 'tren' using 'make'
-# $Id: makefile,v 1.104 2010/08/27 20:20:11 tundra Exp $
+# $Id: makefile,v 1.105 2010/08/28 00:21:48 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -44,7 +44,7 @@
 #####
 
 ###
-# 'troff' Sources
+# Old Rules
 ###
 
 # %.1.gz: %.1
@@ -59,39 +59,45 @@
 # %.html: %.1
 #	@manserver $< >$@
 
-# %.ps: %.1
+#%.dvi: %.latex
+#	latex $<
+
+#%.ps: %.1
 #	@groff -man -Tps $< >$@
 
+#%.1: %.rst
+#	@rst2man.py $< >$@
+
+
 ###
-# Restructured Text Sources
+# Man & html Output
 ###
 
 %.html: %.rst
-	rst2html $< >$@
+	@rst2html $< >$@
 
 %.1: %.html
-	w3m -dump $< >$@
+	@w3m -dump $< >$@
 
 %.1.gz: %.1
 	@gzip $<
 
+
+###
+# LaTeX, PostScript, & PDF Output
+###
+
 %.latex: %.rst
-	rst2newlatex  $< >$@
+	rst2latex --stylesheet=parskip $< >$@
 
-###
-# LaTeX, PostScript, & PDF
-###
+%.pdf: %.latex
+	@pdflatex $< $@
+	@pdflatex $< $@
+	@pdflatex $< $@
 
-%.dvi: %.latex
-	latex $<
-	latex $<
-	latex $<
+%.ps: %.pdf
+	@pdftops $< >$@
 
-%.pdf: %.dvi
-	@dvipdf $< $@
-
-%.ps: %.dvi
-	dvips $< >$@
 
 ###
 # Pretty Print Programs & Scripts
@@ -122,7 +128,7 @@
 
 clean:
 	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${DOCSOURCES} ${TARBALL} ${TMPFILE} \
-             *.1 *.aux *.dvi *.latex *.log *.out *.core *~
+             *~ *.1 *.aux *.core *.dvi *.latex *.log *.out *.toc
 
 docs: ${DOCSOURCES} ${DOCFILES} 
 	@chmod 644 ${DOCFILES} ${DOCSOURCES}