diff --git a/srcpkgs/mkpasswd b/srcpkgs/mkpasswd
deleted file mode 120000
index 2c656a9178..0000000000
--- a/srcpkgs/mkpasswd
+++ /dev/null
@@ -1 +0,0 @@
-whois
\ No newline at end of file
diff --git a/srcpkgs/whois/mkpasswd.rshlibs b/srcpkgs/whois/mkpasswd.rshlibs
deleted file mode 100644
index e21903fd3e..0000000000
--- a/srcpkgs/whois/mkpasswd.rshlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-libcrypt.so.1
-libc.so.6
diff --git a/srcpkgs/whois/mkpasswd.template b/srcpkgs/whois/mkpasswd.template
deleted file mode 100644
index 65a6ecda59..0000000000
--- a/srcpkgs/whois/mkpasswd.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'mkpasswd'.
-#
-depends="mkpasswd"
-short_desc="An interface to crypt(3) to generate random passwords"
-long_desc="
- mkpasswd generates passwords and can (optionally) apply them automatically to
- users.  mkpasswd is based on the code from Chapter 23 of the OReilly book:
- Exploring Expect"
-
-do_install()
-{
-        vmove usr/bin/mkpasswd usr/bin
-	vmove usr/share/man/man1/mkpasswd.1 usr/share/man/man1
-	vinstall COPYING 644 usr/share/licenses/${pkgname}
-}
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index c9b2aa3d85..fec83d6338 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,9 +1,10 @@
 # Template file for 'whois'
 pkgname=whois
 version=5.0.19
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr BASEDIR=${XBPS_DESTDIR}/${pkgname}-${version} install-whois"
+make_install_args="prefix=/usr BASEDIR=${XBPS_DESTDIR}/${pkgname}-${version}"
+make_install_target="install-whois"
 makedepends="perl libidn-devel"
 short_desc="The whois client by Marco d Itri"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -25,6 +26,3 @@ post_install() {
 
 }
 
-# for some reason, the mkpasswd utility is part of this pkg, so I split it out
-subpackages="mkpasswd"
-