diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 36c2c58ed..a75c6d5ad 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -12,5 +12,5 @@ EBUILD kismet-2011.03.2-r4.ebuild 4589 RMD160 9298e8196a454f613d5b2cb6d21eb97f47
 EBUILD kismet-2011.03.2-r5.ebuild 4307 RMD160 01d751694d6de7f4c8c3e5bc458a5172cb100ff5 SHA1 31d3d3a0ed6deb62aad51683c924336b3e273a84 SHA256 58b400bc688a80f591ab85ee3f8af5237485998e5ca53f47ecc5ae994c057d0c
 EBUILD kismet-2011.03.2-r6.ebuild 4347 RMD160 2730e6c6a2f550f57fadda0d674b78ffd61bbfe7 SHA1 ecb3bed178a17e0f020fb6641f0a3928544ee41d SHA256 82b7eef46b874a24a120ed82b37e29fc9974dfa5ee44e8b900840fcee1cc5e40
 EBUILD kismet-2011.03.2-r7.ebuild 4140 RMD160 37dc0200d792fdd5870e1b2e914a6592321e3028 SHA1 77e626ec57ddb15ba1af41237eb706e00ffde705 SHA256 9eec7cc2ee22e693536b1af49cac0c83597c4a42df8a778b1c94fb83532522cb
-EBUILD kismet-9999.ebuild 4084 RMD160 cae918b7a045ea9e9384a9b40de521ef8e1adec8 SHA1 c39a746a861ef728811122f20523656133a95213 SHA256 500b8863b631e67c4428e5633f4059c75e5a7a9c8c56337c943b0affd778a012
+EBUILD kismet-9999.ebuild 3976 RMD160 418fb60c4b421bea4ec2f3996831aa317813a60a SHA1 497071b2a21b2439044e1f04d0254039e2f2f048 SHA256 b8bdf747c5b710b448e0b2c08ddb1d644658b5baf40f88d16063c69b608c9f6c
 MISC metadata.xml 752 RMD160 fab1c88b553c13210494a57a04b2d62536a4f944 SHA1 11fb1ef46c28a2862a850b13e9af6fb405b8a008 SHA256 661ef87ec9fa7e443e0c3741199c1a9217a0932e1023288030a8cfbdbea0256a
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 24864312b..f6bbab14d 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.kismetwireless.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+ncurses +pcre speech +plugin-syslog +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
+IUSE="+client +pcre speech +plugin-syslog +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
 
 RDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
@@ -33,7 +33,7 @@ RDEPEND="net-wireless/wireless-tools
 	net-libs/libpcap
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
-	ncurses? ( sys-libs/ncurses )
+	client? ( sys-libs/ncurses )
 	speech? ( app-accessibility/flite )
 	ruby? ( dev-lang/ruby )
 	plugin-btscan? ( net-wireless/bluez \
@@ -56,15 +56,9 @@ src_prepare() {
 }
 
 src_configure() {
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	if ! use pcre; then
-		myconf="${myconf} --disable-pcre"
-	fi
-
-	econf ${myconf}
+	econf \
+		$(use_enable client) \
+		$(use_enable pcre)}
 }
 
 src_compile() {