diff --git a/makefile b/makefile
index 209a1fe..bd52f54 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # Build a release of tconfpy using 'make'
-# $Id: makefile,v 1.112 2012/05/29 17:33:15 tundra Exp $
+# $Id: makefile,v 1.113 2012/06/09 19:28:43 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
@@ -78,12 +78,6 @@
 
 FORCE:
 
-clean:
-	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SRCFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE} *.core *~
-
-version:
-	@echo ${VERSION}
-
 CHANGELOG.txt: FORCE
 	@cvs log ${PROGNAME}.py >CHANGELOG.txt
 
@@ -93,7 +87,6 @@
 	@emacs -nw $@
 	@cvs commit -m${HEADER1} $@
 
-
 docs: ${DOCFILES} ${SUPPFILES}
 	@chmod 644 ${DOCFILES} ${SUPPFILES}
 	@chmod 644 *.gz *.txt
@@ -111,3 +104,18 @@
 	@mv ${DIR}.tar.gz ${RELDIR}
 
 
+#####
+# 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