--- /usr/portage/net-misc/jwhois/jwhois-4.0-r1.ebuild	2012-12-29 12:31:24.000000000 -0500
+++ /usr/local/portage/net-misc/jwhois/jwhois-4.0-r1.ebuild	2014-03-16 21:08:09.000000000 -0400
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
 HOMEPAGE="http://www.gnu.org/software/jwhois/"
@@ -15,16 +15,22 @@
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="idn nls"
 
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}"
+RDEPEND="idn? ( net-dns/libidn )
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}
+	sys-devel/automake:1.9
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-connect-logic.patch #208875
+	epatch "${FILESDIR}/${P}-connect-logic.patch" #208875
+
+	epatch "${FILESDIR}/${P}-libiconv.patch"
+	eautomake
 }
 
 src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var/cache" \
+	econf	--localstatedir="${EPREFIX}/var/cache" \
 		--without-cache \
 		$(use_enable nls) \
 		$(use_with idn libidn)