diff --git a/net-wireless/madwifi-hal/Manifest b/net-wireless/madwifi-hal/Manifest
index 55af43616..9db1e76e5 100644
--- a/net-wireless/madwifi-hal/Manifest
+++ b/net-wireless/madwifi-hal/Manifest
@@ -1,4 +1,6 @@
 AUX madwifi-hal-injection-r3925.patch 1176 RMD160 8147fbd8919bb6e48f1ea7f327c1bb2eaee76bef SHA1 eff3598129235b30e3841652fc3ec8770a7aa5a4 SHA256 2bb1d618ab01f08cd4b15a66bd4dd6d0dbcebba301edd14c5b0e9095eb23a6cc
 AUX madwifi-hal-release_header_fix.patch 582 RMD160 9ffcdda76be8d5561adb893fa9fced0064cbf25b SHA1 9038ce45e4a3b7477067843d591ebe45fd3ec84b SHA256 5572ba1214c55d99baf2f613e7a2d2c6432844d40025e335d502e8e6d9954c09
 DIST madwifi-hal-0.10.5.6-r3917-20090116.tar.gz 4421921 RMD160 833301ec92cda683737d639b59d29332970097f3 SHA1 22bf3d5980586fc956c8437477ae3f481ccdaa69 SHA256 06d6a65f467f3a8cbc42251e2be53487425db37d55f7e4cbc7aa31edb9c0d81e
-EBUILD madwifi-hal-0.10.5.6-r3917.ebuild 3138 RMD160 b6f3c6dd63bd22855b0c437026bf7fa449ba1f98 SHA1 f73a8cc684154f4f8aa67f8948d3cf5fdaab26bf SHA256 77075a56aefeeea2e975350c01451a5e9952bb60451d7f48dda1ce819073291a
+DIST madwifi-hal-0.10.5.6-r3942-20090205.tar.gz 4421112 RMD160 6c2589d08e64c1ec12611a96c30b460abbedbb1d SHA1 1e14b41f6cb13dbbe8b095bea2bdeff43ad69f82 SHA256 285b7aacaa05ea214277647c0f3ff2ca2ba86b1760dc9328a4ad6f5027b08cf5
+EBUILD madwifi-hal-0.10.5.6-r3917.ebuild 3146 RMD160 3598b4ff63afa30d575eb170311ecdcd8191b166 SHA1 be0dac90cafbfe44d94bace9658a55e238ed0f2d SHA256 5899e05403204cf1f58f48193e21d0e15db2fabdd222d5017f04fd2eff7c2bb2
+EBUILD madwifi-hal-0.10.5.6-r3942.ebuild 4269 RMD160 8ad493d572e5faa2bbf69253c17a759529393a84 SHA1 182951698e83625e937b217fd3f14cfec769e8dd SHA256 89fd61483167fda4314a106809ad9baae55a42a8dc06eb5c9d721ac083c8815f
diff --git a/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3917.ebuild b/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3917.ebuild
index 3bc5006fc..559b9f175 100644
--- a/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3917.ebuild
+++ b/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3917.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${MY_PVR}
 
 DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
 HOMEPAGE="http://www.madwifi.org/"
-SRC_URI="http://snapshots.madwifi.org/${P}/${MY_PVR}.tar.gz"
+SRC_URI="http://snapshots.madwifi-project.org/${P}/${MY_PVR}.tar.gz"
 
 LICENSE="atheros-hal
 	|| ( BSD GPL-2 )"
diff --git a/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3942.ebuild b/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3942.ebuild
new file mode 100644
index 000000000..8db94958d
--- /dev/null
+++ b/net-wireless/madwifi-hal/madwifi-hal-0.10.5.6-r3942.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild,v 1.4 2008/07/21 19:13:53 steev Exp $
+
+inherit linux-mod
+
+MADWIFI_HAL_SNAPSHOT="20090205"
+MY_PVR=${PF}-${MADWIFI_HAL_SNAPSHOT}
+S="${WORKDIR}"/${MY_PVR}
+
+DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="http://snapshots.madwifi.org/${P}/${MY_PVR}.tar.gz"
+
+LICENSE="atheros-hal
+	|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+injection default"
+DEPEND="app-arch/sharutils
+	net-wireless/athload"
+RDEPEND="!net-wireless/madwifi-old
+		net-wireless/wireless-tools
+		=net-wireless/madwifi-hal-tools-${PVR}"
+
+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_rate_minstrel(net:"${S}"/ath_rate/minstrel)
+				ath_pci(net:"${S}"/ath)'
+
+	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	if linux_chkconfig_builtin ATH5K; then 
+		die "Warning: ATH5k was built into the kernel, if you want to use madwifi \
+		then you must set ath5k to disabled or module in your kernel config."
+	fi
+
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-release_header_fix.patch
+	if use injection; then epatch "${FILESDIR}/${PN}-injection-r3925.patch"; fi
+	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/minstrel ath_rate/onoe ath_rate/sample; do
+		convert_to_m "${S}"/${dir}/Makefile
+	done
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README THANKS
+}
+
+pkg_postinst() {
+	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
+
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "The type of the created interface can be controlled through the 'autocreate'"
+	einfo "module parameter."
+
+        if linux_chkconfig_module ATH5K; then
+		if use default; then 
+			/usr/sbin/athenable madwifi
+			ewarn "Madwifi has been set to default, this is a bad idea, I hope you know what you are doing."
+			ewarn "If you want to use a card that is already inserted you need to modprobe ath_pci."
+		fi
+		if use !default; then
+			/usr/sbin/athenable ath5k
+			ewarn "Ath5k has been set to default, if you know what you are doing and you really do"
+			ewarn "not want this then set the default use flag and rebuild this package. It is strongly"
+			ewarn "recommended that you keep ath5k as default and use 'athload madwifi' if you need to switch"
+			ewarn "If you want to use a card that is already inserted you may need to modprobe ath5k"
+			ewarn "You can switch between madwifi and ath5k using athload <driver>"
+		fi
+	else
+		if use default; then
+			/usr/sbin/athenable madwifi
+			ewarn "Madwifi has been set to default and ath5k isn't installed.  It is recommened to"
+			ewarn "use ath5k instead of madwifi, you should enable it as a module in your kernel."
+			ewarn "If you enable ath5k as a module you can switch between madwifi and ath5k"
+			ewarn "using athload <driver>"
+		fi
+		if use !default; then
+			/usr/sbin/athenable ath5k
+			ewarn "Madwifi was not installed as default and you don't have ath5k enabled in the kernel"
+			ewarn "as a module.  You need to either enable ath5k in the kernel or rebuild with madwifi"
+			ewarn "and the default use flag or no driver will claim atheros a/b/g cards."
+			ewarn "If you enable ath5k as a module you can switch between madwifi and ath5k"
+			ewarn "using athload <driver>"
+		fi
+        fi
+
+}