--- madwifi-ng-tools-0.9.3.ebuild
+++ madwifi-ng-tools-0.9.3-r1.ebuild
@@ -13,11 +13,12 @@
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 DEPEND="virtual/libc"
 RDEPEND="!net-wireless/madwifi-old-tools
+		!<net-wireless/madwifi-ng-0.9.3-r4
 		${DEPEND}"
 
 src_unpack() {
@@ -48,6 +49,14 @@
 
 	dodir /sbin
 	mv "${D}"/usr/bin/wlanconfig "${D}"/sbin
+
+	# install headers for use by
+	# net-wireless/wpa_supplicant and net-wireless/hostapd
+	cd ${S}/..
+	insinto /usr/include/madwifi/include/
+	doins include/*.h
+	insinto /usr/include/madwifi/net80211
+	doins net80211/*.h
 }
 
 pkg_postinst() {
@@ -59,4 +68,8 @@
 		ewarn "and either run 'udevstart' or reboot for the changes to take effect."
 		ewarn
 	fi
+	einfo
+	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
+	einfo "you should remerge them now."
+	einfo
 }