diff --git a/src/docs/cmu-user/Makefile b/src/docs/cmu-user/Makefile
index defc4a5a6a2a1ab4e2985beead7e0b553850498a..4a3e345769db5e3a5f8958b53f9821f88da63b53 100644
--- a/src/docs/cmu-user/Makefile
+++ b/src/docs/cmu-user/Makefile
@@ -62,7 +62,7 @@ all: cmu-user.ps
 
 %.pdf : %.tex $(FILES)
 	$(PDFLATEX) $<
-	@while ( grep Rerun $*.log > /dev/null ); do \
+	@while ( grep -v 'Package: rerunfilecheck' $*.log | grep Rerun > /dev/null ); do \
 	   $(PDFLATEX) $<; \
 	done
 	if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi
@@ -102,7 +102,7 @@ cmu-user-letter.tex: cmu-user.tex
 
 
 clean:
-	rm -f *.log *.bbl *.blg *.ps *.pdf *.aux *.lof *.toc *.gif *.out *.ilg
+	rm -f *.log *.bbl *.blg *.ps *.pdf *.aux *.lof *.toc *.out *.ilg
 	rm -f *.vdx *.cdx *.tdx *.fdx *.idx *.cnd *.fnd *.tnd *.vnd *.haux
 	rm -f *.html *.hcnd *.htnd *.hvnd *.hfnd *.htoc