diff --git a/makefile b/makefile
index de81bcd..48c62d0 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of tconfpy using 'make'
-# $Id: makefile,v 1.102 2005/04/07 18:16:37 root Exp $
+# $Id: makefile,v 1.103 2012/06/14 15:32:13 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -35,7 +35,7 @@
 HEADER2      = "----------------------------------------------------------------------"
 TARBALL      = ${DIR}.tar.gz
 TMPFILE      = tmpfile
-VERSION      = $(shell rlog -v ${PROGNAME}.py | cut -f 2 -d " ")${EARLY}
+VERSION      = $(shell cvs log ${PROGNAME}.py | grep ^head\: | cut -f2 -d " ")${EARLY}
 
 
 #####
@@ -74,22 +74,16 @@
 # Actual Build Rules
 #####
 
-clean:
-	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE} *.core *~
+FORCE:
 
-version:
-	@echo ${VERSION}
+CHANGELOG.txt: FORCE
+	@cvs log ${PROGNAME}.py >CHANGELOG.txt
 
-CHANGELOG.txt:
-	@rlog ${PROGNAME}.py >CHANGELOG.txt
-
-WHATSNEW.txt:
-	@co -l $@
+WHATSNEW.txt: FORCE
 	@printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE}
 	@mv ${TMPFILE} $@
-	@emacs $@
-	@ci -m${HEADER1} $@
-	@co $@
+	@emacs -nw $@
+	@cvs commit -m${HEADER1} $@
 
 docs: ${DOCFILES} ${SUPPFILES}
 	@chmod 644 ${DOCFILES} ${SUPPFILES}
@@ -104,6 +98,22 @@
 	@mv ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR}
 	@tar -czvf ${TARBALL} ${DIR}
 	@rm -rf ${DIR}
+	@mkdir Releases
 	@mv ${DIR}.tar.gz Releases
 
 
+#####
+# Housekeeping
+#####
+
+clean:
+	@rm -rf  *~ *.1 *.1.gz *.aux *.core *.dvi *.latex *.log *.out tmpfile *.toc
+
+version:
+	@echo ${VERSION}
+
+scrub: clean
+	@rm -rf  ${DIR} ${PROGFILES} ${DOCFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE}
+
+init: scrub
+	cvs update