diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template
index 61d76545605..d2a6cf676fe 100644
--- a/srcpkgs/base-system-busybox/template
+++ b/srcpkgs/base-system-busybox/template
@@ -1,7 +1,7 @@
 # Build template for 'base-system-busybox'.
 pkgname=base-system-busybox
 version=1.21.1
-revision=1
+revision=2
 wrksrc="busybox-${version}"
 homepage="http://www.busybox.net"
 makedepends="perl"
@@ -13,6 +13,9 @@ checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303
 
 do_build() {
 	cp -f ${FILESDIR}/dotconfig .config
+	if [ "$CROSS_BUILD" ]; then
+		sed -e "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" -i .config
+	fi
 	make ${makejobs}
 }
 
@@ -36,7 +39,7 @@ base-system-busybox_package() {
 	FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk
 		grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
 		patch powertop procps-ng psmisc rfkill run-parts sed tar
-		traceroute util-linux wget which xz"
+		traceroute util-linux wget which whois xz"
 	for f in ${FEATURES}; do
 		provides+="${f}-${version}_${revision} "
 		replaces+="${f}>=0 "