--- getweb.in	2009-05-04 09:10:55.000000000 -0500
+++ getweb.in	2009-06-23 12:24:38.000000000 -0500
@@ -11,7 +11,7 @@
 
 VERSION='$Id: getweb.in,v 1.85 2009/05/04 14:10:55 rick Exp $'
 
-WGETOPTS="--passive-ftp -q"
+FETCHOPTS="-p -m -o"
 
 usage() {
 cat <<EOF
@@ -111,7 +111,7 @@
     exefile="$2"
     shift; shift
     
-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
+    fetch $FETCHOPTS $exefile "$url/$exefile" ||
 	error "Couldn't download $url/$exefile"
     unzip -oj $exefile "$@"
     rm $exefile
@@ -125,7 +125,7 @@
     file="$2"
     what="$3"
     
-    wget $WGETOPTS -O $file "$url/$file" ||
+    fetch $FETCHOPTS $file "$url/$file" ||
 	error "Couldn't download $url/$file"
     gunzip <$file | tar xvf - $what
     rm $file
@@ -193,13 +193,13 @@
 	;;
     2200dl|2200)
 	getexe \
-	    ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
+	    http://printer.konicaminolta.net/drivers/win2000 m22dlicc.exe \
 	    "*.icm"
 	copyright "(c) Copyright Minolta-QMS 1999"
 	;;
     2300dl|2300)
 	getexe \
-	    ftp://ftp.minolta-qms.com/pub/crc/out_going/other m23dlicc.exe \
+	    http://printer.konicaminolta.net/drivers/other m23dlicc.exe \
 	    "*.icm"
 	gettgz \
 	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
@@ -212,7 +212,7 @@
 	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
 	FILE="MC2300DL_v255.zip"
 	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
-	wget $WGETOPTS "$URL" || error "Couldn't download $URL"
+	fetch $FETCHOPTS "$URL" || error "Couldn't download $URL"
 	echo "*** Now use a windows box to unzip and install $FILE ***"
 	;;
     cpwl|pageworks)
@@ -224,7 +224,7 @@
 	    do
 		base=`basename $i .IC_`
 		mv $base.IC_ $base.ic_
-		./msexpand $base.ic_
+		msexpand $base.ic_
 		rm -f $base.ic_
 	    done
 	    copyright "(c) Copyright Minolta-QMS 1998"
@@ -332,7 +332,7 @@
 	    URL="$URL?driver=$driver&printer=$printer"
 	    URL="$URL&.submit=Generate+PPD+file"
 	    URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
-	    wget $WGETOPTS -O PPD/$printer.ppd "$URL" ||
+	    fetch $FETCHOPTS PPD/$printer.ppd "$URL" ||
 		error "Couldn't dowload $URL"
 	done
 	;;
@@ -368,7 +368,7 @@
     update)
 	url=${URLZJS}
 	file=foo2zjs.tar.gz
-	wget $WGETOPTS -O $file $url/$file ||
+	fetch $FETCHOPTS $file $url/$file ||
 		error "Couldn't download $url/$exefile"
 	mv getweb getweb.old
 	HERE=`pwd`