--- bsdwhois-1.43.2.1.ebuild.orig	2012-08-19 17:31:34.000000000 -0600
+++ bsdwhois-1.43.2.1.ebuild	2012-08-19 17:28:56.000000000 -0600
@@ -2,20 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild,v 1.11 2009/11/04 16:09:24 maekke Exp $
 
+EAPI=4
+
 DESCRIPTION="FreeBSD Whois Client"
 HOMEPAGE="http://www.freebsd.org/"
 SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="userland_BSD"
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	if ! use userland_BSD; then
-		mv "${D}"/usr/share/man/man1/{whois,bsdwhois}.1
-		mv "${D}"/usr/bin/{whois,bsdwhois}
+		mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1
+		mv "${ED}"/usr/bin/{whois,bsdwhois}
 	fi
 }