diff -ur a/madwifi-ng-9999.ebuild b/madwifi-ng-9999.ebuild
--- a/madwifi-ng-9999.ebuild	2008-02-14 08:27:32.000000000 +0100
+++ b/madwifi-ng-9999.ebuild	2008-02-14 08:26:32.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: $
 
 inherit linux-mod subversion eutils
 
@@ -19,29 +19,31 @@
 		net-wireless/wireless-tools
 		~net-wireless/madwifi-ng-tools-${PV}"
 
-CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
+CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL KMOD"
 ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
 ERROR_WIRELESS_EXT="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
 ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
+ERROR_KMOD="${F} requires CONFIG_KMOD to be set to y or m"
 BUILD_TARGETS="all"
 MODULESD_ATH_PCI_DOCS="README"
 
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)
-				ath_rate_amrr(net:${S}/ath_rate/amrr)
-				ath_rate_onoe(net:${S}/ath_rate/onoe)
-				ath_rate_sample(net:${S}/ath_rate/sample)
-				ath_pci(net:${S}/ath)"
+	MODULE_NAMES='ath_hal(net:"${S}"/ath_hal)
+				wlan(net:"${S}"/net80211)
+				wlan_acl(net:"${S}"/net80211)
+				wlan_ccmp(net:"${S}"/net80211)
+				wlan_tkip(net:"${S}"/net80211)
+				wlan_wep(net:"${S}"/net80211)
+				wlan_xauth(net:"${S}"/net80211)
+				wlan_scan_sta(net:"${S}"/net80211)
+				wlan_scan_ap(net:"${S}"/net80211)
+				ath_rate_amrr(net:"${S}"/ath_rate/amrr)
+				ath_rate_onoe(net:"${S}"/ath_rate/onoe)
+				ath_rate_sample(net:"${S}"/ath_rate/sample)
+				ath_rate_minstrel(net:"${S}"/ath_rate/minstrel)
+				ath_pci(net:"${S}"/ath)'
 
 	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
 
@@ -53,9 +55,9 @@
 	einfo "fixing svnversion.h quirk [sed '/#include "svnversion.h"/d' -i release.h]"
 	sed '/#include "svnversion.h"/d' -i release.h
 
-	epatch ${FILESDIR}/${PN}-9999-uudecode-gcda-fix.patch
-	if use injection; then epatch ${FILESDIR}/${PN}-r1886.patch; fi
-	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
+	epatch "${FILESDIR}"/"${PN}"-9999-uudecode-gcda-fix.patch
+# 	if use injection; then epatch ${FILESDIR}/${PN}-r1886.patch; fi
+	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel; do
 		convert_to_m ${dir}/Makefile
 	done
 }