diff --git a/sys-kernel/compat-drivers/Manifest b/sys-kernel/compat-drivers/Manifest
index 484fb19c9..b69d71f0e 100644
--- a/sys-kernel/compat-drivers/Manifest
+++ b/sys-kernel/compat-drivers/Manifest
@@ -10,5 +10,5 @@ DIST compat-drivers-3.7-rc1-6.tar.gz 7877572 SHA256 688406f3d9a84246dc0d57b93b53
 DIST compat-drivers-3.8-rc5-1-u.tar.xz 5299080 SHA256 0952e211e7352bbb4b236853c751ab4ffffebf4923517316f9579e644e0eabc8 SHA512 bc80b129d709aaf7eb76d6ec388d4b76ce60eb9a61101eae8ad6a43c09097d927651f462810735f56e53b035f3b7ce3c422a2894ca4ccca234bba9c61850877c WHIRLPOOL f31192ad24b81f55d7bcf1b03ddc70b6e9d20acd8f106ab7edcfd8a461d44270d1deb1d87451f540e050c04bef2ec20524d75777357a7ebc56ef76baa7257d21
 EBUILD compat-drivers-3.7_rc1_p6-r1.ebuild 6976 SHA256 82a760ef9a1448e865dd2936ab3a9824da2c2f6195bce0dec091a9c569a36f18 SHA512 dc907bea77600697458d478418fc719b046ec4e3d09443891ab7235ba40e256b5ac57f7a9355ac67ab25eca4c01e4502a4cda0667a961165549cc4c6758b4249 WHIRLPOOL 7d2361bbd4f6417f934fe7763a5d33a49da18d3a17be53d85fe422c6ce0888b889a136407edae05d10e855ac61d711800bf763a7ebe15e92f2871299b1bc51ed
 EBUILD compat-drivers-3.7_rc1_p6.ebuild 7446 SHA256 1b80374769f13fb010ab0d288b5b03ff8a1eb3edde602f09cb8e242debda222d SHA512 0020e15c77d0b3692d3ffb38cd4268b245acb8f9995612f978c41df30b98eecb7d2dc989b7ea82fb5f589eb9abfb7c4b694217fafdad1db818c9b6b521edd9d1 WHIRLPOOL 967238ad9352b14ae10c6c47d71e4fd6aa44a2ec205f161b9c74f8a1112306b2ecad6c0bff2b11c5eec54c526629639e64073204c742555731ab2e94eb047130
-EBUILD compat-drivers-3.8_rc5.ebuild 6856 SHA256 d095598b1883c1d57cc11e65260b175d0e4d0633355ef4f64758e1e94d79e781 SHA512 fca2bd7ee2ec1f10b1aa1ea4ae63e47521fe0ba8f302a994e421b279e346ce8227053ddfaa5ec92103df4ec6a6885b7a07900f272d179c0d76c8e6bf19c1d486 WHIRLPOOL 49a2a1c004659c89c21958b3503e4d7495b7a26873a723ff044bf5e3f0582d467e0cffc1a450e923a34102ac21e135f5b1de13fef5a242c5f953a1ab5c41a17d
+EBUILD compat-drivers-3.8_rc5.ebuild 6868 SHA256 5c9d8912bed6a553e855b305e6cc39dc15f983bade5b7763441b05999b241cfa SHA512 0c41ee5aa982194775f1a837cdb168564e9ec094676b2bbfff54465bbe3f296210f79eae2b8330d1c1fcbf7249d002d9a2b20c171e6b89f305768e8bf5dd54e5 WHIRLPOOL 2d38c9bc1491377d1f80d580292548d787c5370af29114e4845016a589649a30fdfee1d10fb7b4d2f1f3d37c7581f7a3ef4bfa51e623b7e784f33e62c41bdda2
 MISC metadata.xml 3316 SHA256 4d31b4636c4f5d4e0609c4b7fdae35beb532c8ed7277ecdbbe1a3b026b5a8d55 SHA512 b6364283961c5fc7948c5cde8f2a674adef64ba49112d0b7089b89b7a57ba184daf2a3a8243df6b457f4ecbdca226c61ed1bd1a3ece2d840f0129d42aba4e074 WHIRLPOOL 5acca098ba7ecbf7b50cc846a6b5e31b5471eb84b89ad71ddc4c30e41ff82e046af0378880b8cb060aecd5fab5dad24c71a39da8e518568f8ca4495ffdab9e56
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild
index 26eb0005e..710ad2b83 100644
--- a/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild
+++ b/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://kernel/linux/kernel/projects/backports/stable/v${UPSTREAM_PVR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS=""
 
 IUSE="atheros_obey_crda debugfs debug-driver full-debug injection livecd loadmodules noleds pax_kernel"
 
@@ -48,7 +48,7 @@ RDEPEND="${DEPEND}
 	>=sys-kernel/linux-firmware-20110219
 	virtual/udev"
 
-S="${WORKDIR}/${PN}-${UPSTREAM_PVR}"
+S="${WORKDIR}/${PN}-${UPSTREAM_PVR}-1-u"
 
 RESTRICT="strip"
 
@@ -75,8 +75,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec.patch
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec-warnings.patch
+	use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec.patch
+	use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec-warnings.patch
 
 	#mcgrof said prep for inclusion in compat-wireless.git but this causes issues
 	#find "${S}" -name Makefile | xargs sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' -e 's/CONFIG_COMPAT_CHECK/CONFIG_CHECK/'