cleanup():  Remove *all* the temp files related to index generation!
diff --git a/Doc/tools/mkhowto.sh b/Doc/tools/mkhowto.sh
index 6291cdb..fe47bea 100755
--- a/Doc/tools/mkhowto.sh
+++ b/Doc/tools/mkhowto.sh
@@ -123,7 +123,8 @@
 }
 
 cleanup() {
-    rm -f $1.aux $1.log $1.out $1.toc $1.bkm $1.idx $1.ind mod$1.ind
+    rm -f $1.aux $1.log $1.out $1.toc $1.bkm $1.idx $1.ilg $1.ind
+    rm -f mod$1.idx mod$1.ilg mod$1.ind
     if [ ! "$BUILD_DVI" ] ; then
 	rm -f $FILE.dvi
     fi
@@ -184,6 +185,7 @@
 	    shift 1
 	    ;;
 	--)
+	    shift 1
 	    break
 	    ;;
 	-*)