diff --git a/makefile b/makefile
index c9baf53..6d92708 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of tconfpy using 'make'
-# $Id: makefile,v 1.114 2012/06/09 19:08:15 tundra Exp $
+# $Id: makefile,v 1.115 2012/06/09 19:22:59 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 # Uncomment One Of The Following For Early Releases
@@ -80,12 +80,6 @@
 
 FORCE:
 
-clean:
-	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE} ${PROGNAME}.3 ${TESTPROG}.1 *.pyc *~
-
-version:
-	@echo ${VERSION}
-
 CHANGELOG.txt: FORCE
 	@cvs log ${PROGNAME}.py >CHANGELOG.txt
 
@@ -112,3 +106,19 @@
 	@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} ${DOCS} ${PROGDOCS} ${TARBALL} ${TMPFILE}
+
+init: scrub
+	cvs update
+