--- wpa_supplicant-0.5.7.ebuild
+++ wpa_supplicant-0.5.7-r1.ebuild
@@ -10,14 +10,16 @@
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
 			gsm? ( sys-apps/pcsc-lite )
-		 	madwifi? (
-				|| ( net-wireless/madwifi-ng net-wireless/madwifi-old )
+		 	madwifi? ( ||
+				( >net-wireless/madwifi-ng-tools-0.9.3
+				<net-wireless/madwifi-ng-0.9.3-r4
+				net-wireless/madwifi-old )
 			)
 		)
 		!kernel_linux? ( net-libs/libpcap )
@@ -205,8 +207,8 @@
 
 	if use madwifi; then
 		echo
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
+		einfo "This package compiles against the headers installed by"
+		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
+		einfo "You should remerge ${PN} after upgrading these packages."
 	fi
 }