diff --git a/makefile b/makefile
index 6f1d638..9b6ce70 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of 'tren' using 'make'
-# $Id: makefile,v 1.105 2010/08/28 00:21:48 tundra Exp $
+# $Id: makefile,v 1.106 2012/06/09 20:10:58 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -36,7 +36,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}
 
 
 #####
@@ -114,17 +114,16 @@
 # Actual Build Rules
 #####
 
+FORCE:
 
-CHANGELOG.txt:
-	@rlog ${PROGNAME}.py >CHANGELOG.txt
+CHANGELOG.txt: FORCE
+	@cvs log ${PROGNAME}.py >CHANGELOG.txt
 
-WHATSNEW.txt:
-	@co -l $@
+WHATSNEW.txt: FORCE
 	@printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE}
 	@mv ${TMPFILE} $@
 	@emacs -nw $@
-	@ci -m${HEADER1} $@
-	@co $@
+	@cvs commit -m${HEADER1} $@
 
 clean:
 	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${DOCSOURCES} ${TARBALL} ${TMPFILE} \
@@ -133,7 +132,6 @@
 docs: ${DOCSOURCES} ${DOCFILES} 
 	@chmod 644 ${DOCFILES} ${DOCSOURCES}
 	@chmod 644 *.gz *.txt
-	@flip -u *txt
 
 progs: ${PROGFILES}
 	chmod 755 ${PROGFILES}
@@ -145,5 +143,19 @@
 	@rm -rf ${DIR}
 	@mv ${DIR}.tar.gz Releases
 
+
+#####
+# Housekeeping
+#####
+
+clean:
+    @rm -rf  *~ *.1 *.1.gz *.aux *.core *.dvi *.latex *.log *.out tmpfile *.toc
+
 version:
-	@echo ${VERSION}
+    @echo ${VERSION}
+
+scrub: clean
+    @rm -rf  ${DIR} ${PROGFILES} ${DOCS} ${PROGDOCS} ${TARBALL} ${TMPFILE}
+
+init: scrub
+    cvs update