diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template
index a60784e508..59ba5c2d11 100644
--- a/srcpkgs/net-tools/template
+++ b/srcpkgs/net-tools/template
@@ -1,28 +1,29 @@
 # Template file for 'net-tools'
 pkgname=net-tools
 version=1.60
-distfiles="http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$version.tar.bz2"
-revision=1
+revision=2
 short_desc="Basic networking tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.tazenda.demon.co.uk/phil/$pkgname"
+license="GPL-2"
+distfiles="http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$version.tar.bz2"
 checksum=7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
 long_desc="
  The ${pkgname} package contains basic networking tools, including
  ifconfig, netstat, route, and others."
 
-
-do_build()
-{
-	cd ${wrksrc} || return 1
+do_build() {
 	. $XBPS_HELPERSDIR/replace-interpreter.sh
 	replace_interpreter bash configure.sh
-
-	yes "" | make || return 1
+	yes "" | make
 }
 
-do_install()
-{
-	cd ${wrksrc} || return 1
-	make BASEDIR=${DESTDIR} update || return 1
+do_install() {
+	make BASEDIR=${DESTDIR} update
 	rm -rf ${DESTDIR}/usr/share/man/man1
+	# Switch to /usr.
+	vmkdir usr/bin
+	vmkdir usr/sbin
+	vmove "bin/*" usr/bin
+	vmove "sbin/*" usr/sbin
 }