--- hostapd-0.4.9.ebuild
+++ hostapd-0.4.9-r1.ebuild
@@ -10,12 +10,15 @@
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="ipv6 logwatch madwifi ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl )
-		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 ) )"
 DEPEND="${RDEPEND}
 		sys-apps/sed"
 
@@ -109,9 +112,9 @@
 	einfo "mode_wlan0=\"master\""
 	einfo
 	if use madwifi; then
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should remerge ${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."
 		einfo
 	fi
 }