diff --git a/makefile b/makefile
index e8f7427..372fac2 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of 'tbku' using 'make'
-# $Id: makefile,v 1.100 2008/03/10 22:28:39 tundra Exp $
+# $Id: makefile,v 1.101 2008/03/11 18:29:14 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -13,16 +13,19 @@
 # Definitions Relevant To This Program
 #####
 
-PROGNAME  = tbku
+PROGNAME   = tbku
 
-PORTNAME  = ${PROGNAME}
+PORTNAME   = ${PROGNAME}
 
-PROGFILES = ${PROGNAME}.py
+PROGFILES  = ${PROGNAME}
 
-SUPPFILES = ${PROGNAME}-license.txt  CHANGELOG.txt Makefile READ-1ST.txt WHATSNEW.txt setup.py
+DOCSOURCES = ${PROGNAME}-license.txt ${PROGNAME}.txt  CHANGELOG.txt Makefile WHATSNEW.txt \
+             Imaging-FreeBSD-With-tbku.txt Imaging-SUSE-Linux-With-tbku.txt
 
-DOCFILES  = ${PROGNAME}.html ${PROGNAME}.pdf ${PROGNAME}.ps ${PROGNAME}.py.ps ${PROGNAME}.txt \
-            ${PROGNAME}.1.gz
+DOCFILES   = ${PROGNAME}.1.gz ${PROGNAME}.html ${PROGNAME}.pdf ${PROGNAME}.ps  \
+             Imaging-FreeBSD-With-tbku.html Imaging-SUSE-Linux-With-tbku.html  \
+             Imaging-FreeBSD-With-tbku.pdf Imaging-SUSE-Linux-With-tbku.pdf    \
+             Imaging-FreeBSD-With-tbku.ps Imaging-SUSE-Linux-With-tbku.ps
 
 
 #####
@@ -35,18 +38,24 @@
 HEADER2      = "----------------------------------------------------------------------"
 TARBALL      = ${DIR}.tar.gz
 TMPFILE      = tmpfile
-VERSION      = $(shell rlog -v ${PROGNAME}.py | cut -f 2 -d " ")${EARLY}
+VERSION      = $(shell rlog -v ${PROGNAME} | cut -f 2 -d " ")${EARLY}
 
 
 #####
 # Pattern Rules
 #####
 
+%.1.gz: %.1
+	@gzip $<
+
+%.1: %.txt
+	@cp $< $@
+
 %.dvi: %.latex
 	latex $<
 
-%.html: %.1
-	@manserver $< >$@
+# %.html: %.1
+#	@manserver $< >$@
 
 %.html: %.txt
 	rst2html.py $< >$@
@@ -60,33 +69,26 @@
 %.pdf: %.ps
 	@gs -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$@ $<
 
-%.ps: %.1
-	@groff -man -Tps $< >$@
+# %.ps: %.1
+#	@groff -man -Tps $< >$@
 
 %.ps: %.dvi
 	dvips $< >$@
 
 %.py.ps: %.py
 	@enscript -Epython -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
+
 %.txt: %.1
 	@groff -man -Tascii $< | col -xb >$@
 
-%.1.gz: %.1
-	@gzip $<
 
 
 #####
 # Actual Build Rules
 #####
 
-clean:
-	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE} *.core *~
-
-version:
-	@echo ${VERSION}
-
 CHANGELOG.txt:
-	@rlog ${PROGNAME}.py >CHANGELOG.txt
+	@rlog ${PROGNAME} >CHANGELOG.txt
 
 WHATSNEW.txt:
 	@co -l $@
@@ -96,8 +98,11 @@
 	@ci -m${HEADER1} $@
 	@co $@
 
-docs: ${DOCFILES} ${SUPPFILES}
-	@chmod 644 ${DOCFILES} ${SUPPFILES}
+clean:
+	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${DOCSOURCES} ${TARBALL} ${TMPFILE} \
+             *.1 *.aux *.log *.out *.core *~
+docs: ${DOCSOURCES} ${DOCFILES} 
+	@chmod 644 ${DOCFILES} ${DOCSOURCES}
 	@chmod 644 *.gz *.txt
 	@flip -u *txt
 
@@ -106,9 +111,12 @@
 
 release: docs progs
 	@mkdir ${DIR}
-	@mv ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR}
+	@mv ${DOCFILES} ${PROGFILES} ${DOCSOURCES} ${DIR}
 	@tar -czvf ${TARBALL} ${DIR}
 	@rm -rf ${DIR}
 	@mv ${DIR}.tar.gz Releases
 
+version:
+	@echo ${VERSION}
+