diff --git a/net-wireless/compat-wireless-builder/Manifest b/net-wireless/compat-wireless-builder/Manifest
index 449e77f64..9bc6b75ce 100644
--- a/net-wireless/compat-wireless-builder/Manifest
+++ b/net-wireless/compat-wireless-builder/Manifest
@@ -45,4 +45,4 @@ AUX whynot-2.6.31.patch 4272 RMD160 74ec1c66cfb376cf2c83401aa3edcdbfdd019438 SHA
 AUX whynot-2.6.32.patch 666 RMD160 fcca9ac8d2152bebe51643a4250dffed383aae68 SHA1 5d7261437f5c98758f13c6c3f8a5676769b05013 SHA256 07cfc03d0ad5c47bec08d320afa63c79c0e6be9109dcf42b9811aad10bdc9c63
 AUX whynot.patch 4106 RMD160 ac38e8dbbe1a59607fe16b36f327a9ba73a001e7 SHA1 2208598c9f9811d368db099c863be2a2af11681e SHA256 956cf3a0a8b8e1f0f0e3df985e351799f325a44e4cddf042d677a9e8109b7c9e
 AUX wl1251-inject-2.6.37.patch 47143 RMD160 35cfb086e93ce041fa6d9a698c7e630013ca666c SHA1 526dfe86d2002dd0a2868f5793fc982bd677a340 SHA256 04660a1f7fb241aafeb7fba3a7791cc31fd74efa75fa73616b3abe6b39f89b36
-EBUILD compat-wireless-builder-3.4_rc3.ebuild 8120 RMD160 47e0d8170d4902e03319c4758d0b33d29e299c14 SHA1 f3b1aee02223706ffcad6c62073fd246d927bab3 SHA256 7cf5a9de7ff5fb3567c89dc417cf3ebf8cb2aaba476c77e1936b5f4cb3a7f18b
+EBUILD compat-wireless-builder-3.4_rc3.ebuild 8349 RMD160 674c4e0b87093376904818c10b480f6732e0004c SHA1 921a6ea2e016e2dd61e7d94638bd94f43f676289 SHA256 1c9d41f42a8dcb1307155f1f9cd29e9f8a6072d9d7206de797656bc18ea34a79
diff --git a/net-wireless/compat-wireless-builder/compat-wireless-builder-3.4_rc3.ebuild b/net-wireless/compat-wireless-builder/compat-wireless-builder-3.4_rc3.ebuild
index 5d6ce75fd..7c067af92 100644
--- a/net-wireless/compat-wireless-builder/compat-wireless-builder-3.4_rc3.ebuild
+++ b/net-wireless/compat-wireless-builder/compat-wireless-builder-3.4_rc3.ebuild
@@ -18,9 +18,10 @@ CRAZY_VERSIONING="2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="apply_cherrypicks apply_crap apply_stable apply_pending atheros_obey_crda bluetooth b43 b44 debugfs debug-driver full-debug injection livecd loadmodules +tarball noleds"
+IUSE="+apply_cherrypicks +apply_crap +apply_stable +apply_pending atheros_obey_crda bluetooth b43 b44 debugfs debug-driver full-debug injection livecd loadmodules +tarball noleds"
 
-DEPEND="!net-wireless/compat-wireless"
+DEPEND="!net-wireless/compat-wireless
+	apply_stable? ( dev-util/quilt )"
 RDEPEND="${DEPEND}
 	livecd? ( =sys-kernel/linux-firmware-99999999 )
 		!livecd? ( >=sys-kernel/linux-firmware-20110709 )
@@ -54,7 +55,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-	#EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
 	EGIT_SOURCEDIR="${WORKDIR}/allstable"
 	EGIT_COMMIT="refs/tags/${MY_PV}"
@@ -62,7 +62,11 @@ src_unpack() {
 	unset EGIT_DIR
 	unset EGIT_COMMIT
 
-	#EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat.git"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
+	EGIT_SOURCEDIR="${WORKDIR}/linux-next"
+	git-2_src_unpack
+	unset EGIT_DIR
+
 	EGIT_REPO_URI="git://github.com/mcgrof/compat.git"
 	EGIT_SOURCEDIR="${WORKDIR}/compat"
 	EGIT_BRANCH="linux-$(get_version_component_range 1).$(get_version_component_range 2).y"
@@ -70,7 +74,6 @@ src_unpack() {
 	unset EGIT_DIR
 	unset EGIT_BRANCH
 
-	#EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat-wireless-2.6.git"
 	EGIT_REPO_URI="git://github.com/mcgrof/compat-wireless.git"
 	EGIT_SOURCEDIR="${WORKDIR}/compat-wireless"
 	EGIT_BRANCH="linux-$(get_version_component_range 1).$(get_version_component_range 2).y"
@@ -82,10 +85,13 @@ src_unpack() {
 src_prepare() {
 	use apply_cherrypicks && apply="${apply} -n"
 	use apply_pending && apply="${apply} -p"
-	#use apply_stable && apply="${apply} -s"
+	use apply_stable && apply="${apply} -s"
 	use apply_crap && apply="${apply} -c"
 
-	GIT_TREE="${WORKDIR}/allstable" GIT_COMPAT_TREE="${WORKDIR}/compat" scripts/admin-update.sh${apply} || die
+	#CAUTION: on this line GIT_TREE asks for linux-next but wants stable
+	GIT_TREE="${WORKDIR}/allstable" GIT_COMPAT_TREE="${WORKDIR}/compat" NEXT_TREE="${WORKDIR}/linux-next" scripts/admin-update.sh -s refresh || die
+	#CAUTION: but on this line GIT_TREE wants stable
+	GIT_TREE="${WORKDIR}/allstable" GIT_COMPAT_TREE="${WORKDIR}/compat" NEXT_TREE="${WORKDIR}/linux-next" scripts/admin-update.sh${apply} || die
 
 	if use tarball; then
 		rm -rf .git/