--- madwifi-ng-0.9.3-r3.ebuild
+++ madwifi-ng-0.9.3-r4.ebuild
@@ -19,8 +19,8 @@
 
 DEPEND="app-arch/sharutils"
 RDEPEND="!net-wireless/madwifi-old
-		net-wireless/wireless-tools
-		~net-wireless/madwifi-ng-tools-${PV:0:5}"
+		=net-wireless/${PN}-tools-${PV}-r1
+		net-wireless/wireless-tools"
 
 CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
 ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
@@ -66,13 +66,6 @@
 	linux-mod_src_install
 
 	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
-
-	# install headers for use by
-	# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins include/*.h
-	insinto /usr/include/madwifi/net80211
-	doins net80211/*.h
 }
 
 pkg_postinst() {
@@ -91,7 +84,4 @@
 	einfo "module load time via the 'ratectl' module parameter. USE flags amrr and onoe"
 	einfo "no longer serve any purpose."
 	einfo
-	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
-	einfo "you should remerge them now."
-	einfo
 }