diff --git a/makefile b/makefile
index db34e67..caf5a4a 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of tconfpy using 'make'
-# $Id: makefile,v 1.101 2005/01/15 08:57:55 tundra Exp $
+# $Id: makefile,v 1.102 2005/01/15 09:12:45 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 # Syntax is: make target VER=version-number
@@ -7,20 +7,22 @@
 PROGNAME=tconfpy
 TESTPROG=test-tc
 
-
-DIR       = py-${PROGNAME}-${VER}
+PREFIX    = py-${PROGNAME}
+DIR       = ${PREFIX}-${VER}
+TARBALL   = ${DIR}.tar.gz
 
 PROGFILES = ${PROGNAME}.py ${TESTPROG}.py
 
-MANFILES  = ${PROGNAME}.3 ${TESTPROG}.1 
-
 SUPPFILES = ${PROGNAME}-license.txt  CHANGELOG.txt Makefile READ-1ST.txt WHATSNEW.txt setup.py example.cfg
 
 DOCFILES  = ${PROGNAME}.html ${PROGNAME}.pdf ${PROGNAME}.ps ${PROGNAME}.py.ps ${PROGNAME}.txt \
             ${TESTPROG}.html ${TESTPROG}.pdf ${TESTPROG}.ps ${TESTPROG}.py.ps ${TESTPROG}.txt \
             ${TESTPROG}.1.gz ${PROGNAME}.3.gz
 
+
+#####
 # Pattern Rules
+#####
 
 %.html: %.1
 	@manserver $< >$@
@@ -38,7 +40,7 @@
 	@groff -man -Tps $< >$@
 
 %.py.ps: %.py
-	@enscript -Epython -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$<.ps $@
+	@enscript -Epython -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
 
 %.txt: %.1
 	@groff -man -Tascii $< | col -xb >$@
@@ -52,38 +54,28 @@
 %.3.gz: %.3
 	@gzip $<
 
+#####
 # Actual Build Rules
+#####
 
 clean:
-	@rm -f ${PROGFILES} ${MANFILES} ${SUPPFILES} ${DOCFILES}
-
+	@rm -rf  ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR} ${PREFIX}*
 
 CHANGELOG.txt:
 	@rlog ${PROGNAME}.py >CHANGELOG.txt
 
-
 docs: ${DOCFILES} ${SUPPFILES}
 	@chmod 644 ${DOCFILES} ${SUPPFILES}
 	@chmod 644 *.gz *.txt
 	@flip -u *txt
 
+progs: ${PROGFILES}
+	chmod 755 ${PROGFILES}
 
-#release: docs
-#	@co -l WHATSNEW.txt
-#	@echo "WHATSNEW For 'tconfpy' ${VER}    (`date`)" > wntmp1
-#	@echo "----------------------------------------------------------------------" >> wntmp1
-#	@echo "" >> wntmp1
-#	@cat wntmp1 WHATSNEW.txt >wntmp2
-#	@mv wntmp2 WHATSNEW.txt
-#	@emacs -nw WHATSNEW.txt
-#	@ci WHATSNEW.txt
-#	@rm wntmp1
-#	@co WHATSNEW.txt
-#	@chmod 644 WHATSNEW.txt	
-#	@mkdir ${DIR}
-#	@chmod 755 ${PROGFILES} ${TESTPROG}.py
-#	@mv ${PROGFILES} ${SUPPFILES} ${DOCFILES} ${DIR}
-#	@tar -czvf ${DIR}.tar.gz ${DIR}
+release: docs progs
+	@mkdir ${DIR}
+	@mv ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR}
+	@tar -czvf ${DIR}.tar.gz ${DIR}
 #	@rm -rf ${DIR}
 #	@mv ${DIR}.tar.gz Releases