diff --git a/TODO b/TODO
index 427cbcb..0449a5f 100644
--- a/TODO
+++ b/TODO
@@ -20,7 +20,7 @@
 angela.hill88@gmail.com
 
 
-$Id: TODO,v 1.173 2011/05/21 20:29:41 tundra Exp $
+$Id: TODO,v 1.174 2012/06/08 22:53:28 tundra Exp $
 
 
 Document
@@ -55,6 +55,8 @@
   to save at end of config file.
 
 
+- Implement VAR = `foo` type variable assignments.
+
 
 
 
@@ -140,3 +142,6 @@
     - Copy doc to website
     - Copy example configuration to website
     - Copyright update in: License, Program Code, & Documentation
+
+- Convert to CVS version control
+
diff --git a/makefile b/makefile
index 675e0b9..f283c3a 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of twander using 'make'
-# $Id: makefile,v 1.111 2007/01/08 08:38:10 tundra Exp $
+# $Id: makefile,v 1.112 2012/06/08 22:53:28 tundra Exp $
 
 # Uncomment One Of The Following For Early Releases
 
@@ -12,14 +12,22 @@
 #####
 
 PROGNAME  = twander
+PROGMAIN  = twander.py
 
-PORTNAME  = ${PROGNAME}
+PROGFILES = ${PROGMAIN}
+PROGDOCS  = ${PROGMAIN}.ps 
 
-PROGFILES = ${PROGNAME}.py
+DOCS      = twander-license.txt     \
+            .${PROGNAME}            \
+            ${PROGNAME}.1.gz        \
+            ${PROGNAME}.html        \
+            ${PROGNAME}.pdf         \
+            ${PROGNAME}.ps          \
+            ${PROGNAME}.txt         \
+            CHANGELOG.txt           \
+            Makefile                \
+            READ-1ST.txt            \
 
-SUPPFILES = .${PROGNAME} ${PROGNAME}-license.txt  CHANGELOG.txt Makefile READ-1ST.txt WHATSNEW.txt
-
-DOCFILES  = ${PROGNAME}.html ${PROGNAME}.pdf ${PROGNAME}.ps ${PROGNAME}.py.ps ${PROGNAME}.txt ${PROGNAME}.1.gz
 
 
 #####
@@ -27,22 +35,24 @@
 #####
 
 
-DIR          = ${PORTNAME}-${VERSION}
+DIR          = ${PROGNAME}-${VERSION}
 HEADER1      = "WHATSNEW For '${PROGNAME}' ${VERSION}    (`date`)"
 HEADER2      = "----------------------------------------------------------------------"
+RELEASES     = "Releases"
 TARBALL      = ${DIR}.tar.gz
 TMPFILE      = tmpfile
-VERSION      = $(shell rlog -v ${PROGNAME}.py | cut -f 2 -d " ")${EARLY}
+VERSION      = $(shell cvs log ${PROGMAIN} | grep head | cut -f2 -d " ")${EARLY}
 
 
 #####
 # Pattern Rules
 #####
 
-%.html: %.1
-	@manserver $< >$@
+###
+# Document Production
+###
 
-%.html: %.3
+%.html: %.1
 	@manserver $< >$@
 
 %.pdf: %.ps
@@ -51,58 +61,68 @@
 %.ps: %.1
 	@groff -man -Tps $< >$@
 
-%.ps: %.3
-	@groff -man -Tps $< >$@
-
-%.py.ps: %.py
-	@enscript -Epython -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
-
 %.txt: %.1
 	@groff -man -Tascii $< | col -xb >$@
 
-%.txt: %.3
-	@groff -man -Tascii $< | col -xb >$@
-
 %.1.gz: %.1
-	@gzip $<
+	@gzip -c $< >$@
 
-%.3.gz: %.3
-	@gzip $<
+
+###
+# Pretty Print Programs & Scripts
+###
+
+%.pl.ps: %.pl
+	@enscript -Eperl --color -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
+
+%.py.ps: %.py
+	@enscript -Epython --color -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
+
+%.sh.ps: %.sh
+	@enscript -Esh --color -fCourier8 -i2 -L77 -C --mark-wrapped-lines=arrow -p$@ $<
 
 
 #####
 # Actual Build Rules
 #####
 
+FORCE:
+
+CHANGELOG.txt: FORCE
+	@cvs log ${PROGMAIN} >CHANGELOG.txt
+
+WHATSNEW.txt: FORCE
+	@printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE}
+	@mv ${TMPFILE} $@
+	@emacs -nw $@
+	@cvs commit -m${HEADER1} $@
+
+docs: ${DOCS} ${PROGDOCS} 
+	@chmod 644 ${DOCS} ${PROGDOCS}
+	@chmod 644 *.gz *.txt
+
+release: docs WHATSNEW.txt ${PROGFILES}
+	@mkdir ${DIR}
+	-@mkdir ${RELEASES} 2>&1 >/dev/null
+	@cp -pv WHATSNEW.txt ${PROGFILES} ${DOCS} ${PROGDOCS} ${DIR}
+	@tar -czvf ${TARBALL} --exclude CVS ${DIR}
+	@rm -rf ${DIR}
+	@mv ${DIR}.tar.gz ${RELEASES}
+
+#####
+# Housekeeping
+#####
+
 clean:
-	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE} ${PROGNAME}.1 *.pyc *.pyo *~
+	@rm -rf  *~ *.1 *.1.gz *.aux *.core *.dvi *.latex *.log *.out tmpfile *.toc
 
 version:
 	@echo ${VERSION}
 
-CHANGELOG.txt:
-	@rlog ${PROGNAME}.py >CHANGELOG.txt
+scrub: clean
+	@rm -rf  ${DIR} ${PROGFILES} ${DOCS} ${PROGDOCS} ${TARBALL} ${TMPFILE}
 
-WHATSNEW.txt:
-	@co -l $@
-	@printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE}
-	@mv ${TMPFILE} $@
-	@emacs $@
-	@ci -m${HEADER1} $@
-	@co $@
+init: scrub
+	cvs update
 
-docs: ${DOCFILES} ${SUPPFILES}
-	@chmod 644 ${DOCFILES} ${SUPPFILES}
-	@chmod 644 *.gz *.txt
-	@flip -u *txt
-
-progs: ${PROGFILES}
-	chmod 755 ${PROGFILES}
-
-release: docs progs
-	@mkdir ${DIR}
-	@mv ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR}
-	@tar -czvf ${TARBALL} ${DIR}
-	@rm -rf ${DIR}
-	@mv ${DIR}.tar.gz Releases