diff --git a/makefile b/makefile
index fb34507..1274f3e 100644
--- a/makefile
+++ b/makefile
@@ -119,13 +119,14 @@
 FORCE:
 
 CHANGELOG.txt: FORCE
-	@cvs log ${PROGMAIN} >CHANGELOG.txt
+	@git log --pretty=format:"%h%x20%an%x20%ad%x20%s" ${PROGMAIN} >CHANGELOG.txt
 
 WHATSNEW.txt: FORCE
 	@printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE}
 	@mv ${TMPFILE} $@
 	@emacs -nw $@
-	@cvs commit -m${HEADER1} $@
+	-@git add $@
+	-@git commit -m${HEADER1} $@
 
 docs: ${DOCS} ${PROGDOCS}
 	@chmod 644 ${DOCS} ${PROGDOCS}
@@ -148,13 +149,7 @@
 #####
 
 clean:
-	@rm -rf  *~ *.1 *.1.gz *.aux *.core *.dvi *.latex *.log *.out tmpfile *.toc
+	@rm -rf  ${PROGNAME}.txt CHANGELOG.txt *~ *.1 *.1.gz *.aux *.core *.dvi *.gz *html *.latex *.log *.out *.pdf *.ps tmpfile *.toc
 
 version:
 	@echo ${VERSION}
-
-scrub: clean
-	@rm -rf  ${DIR} ${PROGFILES} ${DOCS} ${PROGDOCS} ${TARBALL} ${TMPFILE}
-
-init: scrub
-	cvs update