diff --git a/templates/adobe-flash-plugin/template b/templates/adobe-flash-plugin/template
index 217d7df5410..ebf4cce09ba 100644
--- a/templates/adobe-flash-plugin/template
+++ b/templates/adobe-flash-plugin/template
@@ -39,7 +39,7 @@ do_install()
 	set -e
 	( cd ${wrksrc}; \
 	  msg_normal "Fetching License..."
-	  wget http://www.adobe.com/products/eulas/pdfs/${license} ; \
+	  $XBPS_FETCH_CMD http://www.adobe.com/products/eulas/pdfs/${license} ; \
 	  install -d ${DESTDIR}/usr/lib/mozilla/plugins \
 		   ${DESTDIR}/usr/share/doc/${pkgname}; \
 	  tar xfz "${XBPS_SRCDISTDIR}/$(basename ${distfiles})" \
diff --git a/templates/bash/template b/templates/bash/template
index fe47aaba388..f0022b3f237 100644
--- a/templates/bash/template
+++ b/templates/bash/template
@@ -42,10 +42,12 @@ Add_dependency run	coreutils
 
 pre_configure()
 {
+	local url="http://ftp.gnu.org/gnu/bash/bash-4.0-patches"
+
 	if [ "${bash_patchlevel}" -gt 000 ]; then
 		for p in $(seq -w 001 ${bash_patchlevel}); do
 			[ -f ${XBPS_SRCDISTDIR}/bash40-${p} ] && continue
-			wget http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-$p
+			$XBPS_FETCH_CMD ${url}/bash40-$p
 		done
 	fi
 	cd ${wrksrc}
diff --git a/templates/readline/template b/templates/readline/template
index 5719a6287be..a4dcb4bb11b 100644
--- a/templates/readline/template
+++ b/templates/readline/template
@@ -27,10 +27,12 @@ Add_dependency run	ncurses-libs
 
 pre_configure()
 {
+	local url="http://ftp.gnu.org/gnu/$pkgname/$pkgname-6.0-patches"
+
 	if [ "${_patch_ver}" -gt 000 ]; then
 		for p in $(seq -w 001 ${_patch_ver}); do
 			[ -f ${XBPS_SRCDISTDIR}/readline60-${p} ] && continue
-			wget http://ftp.gnu.org/gnu/$pkgname/$pkgname-6.0-patches/readline60-$p
+			$XBPS_FETCH_CMD ${url}/readline60-$p
 		done
 	fi
 	cd ${wrksrc}
diff --git a/templates/usbutils/template b/templates/usbutils/template
index 06d4915d160..0e39491f61b 100644
--- a/templates/usbutils/template
+++ b/templates/usbutils/template
@@ -1,7 +1,7 @@
 # Template file for 'usbutils'
 pkgname=usbutils
 version=0.86
-revision=1
+revision=2
 distfiles="${SOURCEFORGE_SITE}/linux-usb/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--datadir=/usr/share/hwdata --disable-zlib"
@@ -16,13 +16,12 @@ Add_dependency full glibc
 Add_dependency full libusb
 Add_dependency full libusb-compat
 Add_dependency build which
-Add_dependency build wget
 
 pre_configure()
 {
 	cd $wrksrc
 	rm usb.ids
-	wget http://www.linux-usb.org/usb.ids
+	$XBPS_FETCH_CMD http://www.linux-usb.org/usb.ids
 }
 
 post_install()