diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index bb9296c90..6e1db13fa 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -9,4 +9,5 @@ DIST wireless-regdb-2009.11.25.tar.bz2 12844 RMD160 a129a77e700b42de339e6c1891d5
 EBUILD wireless-regdb-20090130-r1.ebuild 1064 RMD160 d428dcb67fc6876fd01dac56c2e60d38738f3349 SHA1 e3693e277f12e3c6a77b1fa0c992f09590b8aef7 SHA256 83446433160c2d15e6a53c4920c31bdf425b91d6d1008a8536c98e9c34121780
 EBUILD wireless-regdb-20090309.ebuild 1006 RMD160 c26e06edb51e763c2fa95af9a38587290282651f SHA1 b94515d5cb3bfe26e5bfc2dbc4d96891bacfe685 SHA256 39e29e13e7eddfb5570cb271f98ba906d0a47b6657dd500936c2d7e9620fce68
 EBUILD wireless-regdb-20090817.ebuild 967 RMD160 3222490393c947c8987b8eaa0cd49afccb571093 SHA1 cb40eafba2712c64848952800866608f6d48f3a5 SHA256 2d55b76432f181ff4493f039758ad28662fb66281205deb7ac391bb00069191d
+EBUILD wireless-regdb-20091125-r1.ebuild 1031 RMD160 4879035bc4b43aecafdd095597360e38f9517951 SHA1 25c302441094c61e5ed596c39a4c3e00984292aa SHA256 60d693e0ecb9251d6548423f835ec8450abd881540c6c0b3bf0749ae5b54addf
 EBUILD wireless-regdb-20091125.ebuild 1047 RMD160 3743bae6a7f8e2b34ca3f5d14f14bf7a9d29859b SHA1 31e45b23b1f41c24ad921505141e673a0cf201b9 SHA256 a237766fe331196ba58fe29ba332495f2924f3e16724430f9d023f2f298e6b81
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild
new file mode 100644
index 000000000..7437e604d
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
+LICENSE="as-is"
+SLOT="0"
+
+inherit eutils
+
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+DEPEND="dev-libs/openssl
+	dev-lang/python
+	dev-python/m2crypto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/extra-monitor-${PV}.patch
+}
+
+#TODO: add pentoo use flag to not patch the regdb, maybe adjust deps
+
+src_compile() {
+	emake install-distro-key || die "make install-distro-key failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crda/
+	doins regulatory.bin
+	doins Gentoo.key.pub.pem
+}
diff --git a/pentoo/pentoo-wireless/Manifest b/pentoo/pentoo-wireless/Manifest
new file mode 100644
index 000000000..b75d9e324
--- /dev/null
+++ b/pentoo/pentoo-wireless/Manifest
@@ -0,0 +1 @@
+EBUILD pentoo-wireless-2010.0.ebuild 950 RMD160 731d4e5832a362e7b1aa2fcbebd7274de63f9a35 SHA1 21fea1916e54242810de7d11a1fd9e56c3ca754a SHA256 1f00be9b18688460fc7b835eaaba15ec10f3b9b91a9f0f32e57bbb9f40fcc639
diff --git a/pentoo/pentoo-wireless/pentoo-wireless-2010.0.ebuild b/pentoo/pentoo-wireless/pentoo-wireless-2010.0.ebuild
index 8e226e0a6..5c5efe6b4 100644
--- a/pentoo/pentoo-wireless/pentoo-wireless-2010.0.ebuild
+++ b/pentoo/pentoo-wireless/pentoo-wireless-2010.0.ebuild
@@ -15,13 +15,11 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	app-crypt/asleap
 	net-misc/karma
-	net-wireless/gerix
 	=net-dialup/freeradius-2.1.7[wpe]
 	net-wireless/aircrack-ng
 	net-wireless/airpwn
 	net-wireless/b43-openfwwf
 	net-wireless/broadcom-firmware-downloader
-	x86? ( net-wireless/intel-wimax-network-service )
 	net-wireless/karmetasploit
 	net-wireless/airoscript
 	net-wireless/kismet
@@ -31,12 +29,14 @@ RDEPEND="${DEPEND}
 	net-wireless/wepattack
 	net-wireless/wepdecrypt
 	net-wireless/wifi-radar
-	net-wireless/wifitap
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/cowpatty
 	net-wireless/crda
-	net-wireless/hostapd
-	net-wireless/haraldscan"
+	net-wireless/hostapd"
+	#net-wireless/haraldscan
 	#net-wireless/wifiscanner
+	#x86? ( net-wireless/intel-wimax-network-service )
+	#net-wireless/gerix
+	#net-wireless/wifitap