diff --git a/net-wireless/compat-wireless/Manifest b/net-wireless/compat-wireless/Manifest
index 50b5a2818..06fc922f8 100644
--- a/net-wireless/compat-wireless/Manifest
+++ b/net-wireless/compat-wireless/Manifest
@@ -55,8 +55,9 @@ EBUILD compat-wireless-2.6.35-r1.ebuild 5471 RMD160 dcc6f3666823faee305165a846cd
 EBUILD compat-wireless-2.6.36.ebuild 5332 RMD160 c4a19864f8703fce0b9369fc597f165290c56661 SHA1 efb406e9ab4ea21021f0e09edbfdb2e5d2a08f7e SHA256 52f02128f594db9950425aa03cd90cf9d5ff54d6475b25db696c58cd8c0a75d2
 EBUILD compat-wireless-2.6.37-r7.ebuild 5443 RMD160 629fefa357220ebbad14d4f42979072a6ced87cc SHA1 7cd2e349de253e0f62abbe6c11bbfdc1558877e7 SHA256 f08fb77d9972331aae217e050e034e3bfd17d933c5eb22a272d05c7022f70462
 EBUILD compat-wireless-2.6.38.2-r1.ebuild 5434 RMD160 fdfbb30d004db6b466fb01a4c6b2a72236e1a458 SHA1 b189a8fb941bd978c50f9af350bdeb214eb3862f SHA256 82b14772f1dde5a4578d8663951b7ae8c727869971782a0f2a72ead0d867a272
+EBUILD compat-wireless-2.6.38.2-r2.ebuild 5630 RMD160 29b25a5eea9995fc074ac683b071d8a85e59ace0 SHA1 db0511b4aab4b82a7711e08f75274e4f399d6ab8 SHA256 20cdfd0eb35bb6dd9820a436f88acce9429bc4b8829edcf57ae5e93baabdce09
 EBUILD compat-wireless-2.6.38.2.ebuild 5349 RMD160 997fe67289661b4b59f7b0751745a7b186bf2417 SHA1 43983e2a9b924c11590feffa516563ec2a5add1e SHA256 de62ecf3300a5d1eb52780fb4fe784f5c3702c2ecb3d4acaef0b051d0c0ec52d
 EBUILD compat-wireless-2.6.38.ebuild 5349 RMD160 0ee4a4189fdfcf79549f1322149ca562b4ac8f8a SHA1 d2d22dfa0a7d3fc663779a680d7ac489f02740f5 SHA256 6e842396c1d468750be6a91fd94a784168d56b68513a3e9e660fc0e97c556556
-EBUILD compat-wireless-2.6.39_rc1-r1.ebuild 5521 RMD160 9900a2ed2f9538ca9c879585bfbd3e1520caec1e SHA1 b731fada9dfd123e47bdc018b3c61e9b3d107416 SHA256 2ef4c4e5b53d15ea06cc8ccc7bdaa622fe883c9feae0c11e43fe7d323780ffc0
+EBUILD compat-wireless-2.6.39_rc1-r1.ebuild 5727 RMD160 86cf72f78c3de95e3a7a619f0094bd1136af792b SHA1 2639c2f356e69321664d507a9ce59e549be3089b SHA256 2a18b6d63c7c4add6b355247feb1228810e4f34914d64d493f374b047aafa0cd
 EBUILD compat-wireless-2.6.39_rc1.ebuild 5352 RMD160 843acbacc6d8c1c30c873f4e050a757314ab8707 SHA1 ba8ba48bf7acf5d1287faa287022ecafcdec7732 SHA256 9f24ba20c29c1efe402c51e56ca5f716d680b0ebc5507d66132d74552d3cf6b0
 MISC metadata.xml 228 RMD160 cd3fb26b5d8049ab5dba38f21d7654ec033aa0eb SHA1 3148dfbdced7a623a311d21c6f728ab9c7135dae SHA256 8715828d1bff71d5d96b991ba600bae9376c1c80c96f0f102260fc335ca22487
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38.2-r1.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.38.2-r1.ebuild
index 977b80d75..d6bc9c561 100644
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38.2-r1.ebuild
+++ b/net-wireless/compat-wireless/compat-wireless-2.6.38.2-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="arm amd64 x86"
 IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
 
 DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
+RDEPEND="sys-kernel/linux-firmware"
 
 S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
 RESTRICT="strip"
@@ -97,6 +97,9 @@ src_prepare() {
 			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
 		fi
 	fi
+#	Disable B44 ethernet driver
+	sed -i '/CONFIG_B44=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
+	sed -i '/CONFIG_B44_PCI=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
 }
 
 src_compile() {
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1-r1.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1-r1.ebuild
index 9c01cb336..3c8a0e98a 100644
--- a/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1-r1.ebuild
+++ b/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~arm ~amd64 ~x86"
 IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
 
 DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
+RDEPEND="sys-kernel/linux-firmware"
 
 S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
 RESTRICT="strip"
@@ -100,6 +100,9 @@ src_prepare() {
 			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
 		fi
 	fi
+#	Disable B44 ethernet driver
+	sed -i '/CONFIG_B44=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
+	sed -i '/CONFIG_B44_PCI=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
 }
 
 src_compile() {