diff --git a/sys-kernel/beagle-sources/Manifest b/sys-kernel/beagle-sources/Manifest
index 9975d6b87..a03f54f86 100644
--- a/sys-kernel/beagle-sources/Manifest
+++ b/sys-kernel/beagle-sources/Manifest
@@ -15,6 +15,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD beagle-sources-3.2-r9.ebuild 603 RMD160 c7cce42908d43a73b810a7f7e8d698aff55971a6 SHA1 d1bf1141c128b7e8296b1770119b1b0773cd8e06 SHA256 d5690e351766d2c4e64ef641d90eb9a9b8bd3395fe208fb98586b4c990d2a1b3
 EBUILD beagle-sources-3.3-r1.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
 EBUILD beagle-sources-3.3-r2.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
@@ -31,4 +32,5 @@ EBUILD beagle-sources-3.5-r2.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f55
 EBUILD beagle-sources-3.5-r3.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
 EBUILD beagle-sources-3.5-r4.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
 EBUILD beagle-sources-3.5-r5.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
+EBUILD beagle-sources-3.5-r6.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
 EBUILD beagle-sources-3.5.ebuild 604 RMD160 7a3f372ab063d4cd78479fd17c6510f554413c59 SHA1 787cd373ebe18382f1e5fc6f9783603c38ef5bd8 SHA256 56b59bbf156bb4155b1b877078ad8b1ca2e7222b0a371c0f36f25593c21edad3
diff --git a/sys-kernel/beagle-sources/beagle-sources-3.5-r6.ebuild b/sys-kernel/beagle-sources/beagle-sources-3.5-r6.ebuild
new file mode 100644
index 000000000..e972ebced
--- /dev/null
+++ b/sys-kernel/beagle-sources/beagle-sources-3.5-r6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="beagle"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon BeagleBoard (not yet Bone) OMAP3 Linux Kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-beagle-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-beagle-${PVR} )"
diff --git a/sys-kernel/ec2-sources/Manifest b/sys-kernel/ec2-sources/Manifest
index ad2a9f390..608330b1f 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -6,10 +6,12 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD ec2-sources-3.4-r8.ebuild 509 RMD160 497a46c684bb4eb53ef6e362af83106637d2dcb9 SHA1 fc1488c4e11d6eca4522bec862b4936608890554 SHA256 a8f108b4059347ad28b38b617e7a058f44069a8160332d3d81737777d487148d
 EBUILD ec2-sources-3.5-r1.ebuild 509 RMD160 497a46c684bb4eb53ef6e362af83106637d2dcb9 SHA1 fc1488c4e11d6eca4522bec862b4936608890554 SHA256 a8f108b4059347ad28b38b617e7a058f44069a8160332d3d81737777d487148d
 EBUILD ec2-sources-3.5-r2.ebuild 509 RMD160 497a46c684bb4eb53ef6e362af83106637d2dcb9 SHA1 fc1488c4e11d6eca4522bec862b4936608890554 SHA256 a8f108b4059347ad28b38b617e7a058f44069a8160332d3d81737777d487148d
 EBUILD ec2-sources-3.5-r3.ebuild 509 RMD160 497a46c684bb4eb53ef6e362af83106637d2dcb9 SHA1 fc1488c4e11d6eca4522bec862b4936608890554 SHA256 a8f108b4059347ad28b38b617e7a058f44069a8160332d3d81737777d487148d
 EBUILD ec2-sources-3.5-r4.ebuild 683 RMD160 451aa3157eaa029cf32826285c26033706f7597d SHA1 54b91f84d02da24faafc0240d2c5f9c5faa3f99c SHA256 a2819a8669831d750e86d3005f9202ce6267517c5f749be92e321768b40f39fd
 EBUILD ec2-sources-3.5-r5.ebuild 712 RMD160 9b58079191de1576b5505339f948361990c78b91 SHA1 5f589362b6002841a2eddd4654a42b7e23240f25 SHA256 d1bfadb32f19a8d1ff7dacd0db27710669fa15b8ef31ea354373b33dad662295
+EBUILD ec2-sources-3.5-r6.ebuild 712 RMD160 9b58079191de1576b5505339f948361990c78b91 SHA1 5f589362b6002841a2eddd4654a42b7e23240f25 SHA256 d1bfadb32f19a8d1ff7dacd0db27710669fa15b8ef31ea354373b33dad662295
 EBUILD ec2-sources-3.5.ebuild 509 RMD160 497a46c684bb4eb53ef6e362af83106637d2dcb9 SHA1 fc1488c4e11d6eca4522bec862b4936608890554 SHA256 a8f108b4059347ad28b38b617e7a058f44069a8160332d3d81737777d487148d
diff --git a/sys-kernel/ec2-sources/ec2-sources-3.5-r6.ebuild b/sys-kernel/ec2-sources/ec2-sources-3.5-r6.ebuild
new file mode 100644
index 000000000..da4b5bfa6
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-3.5-r6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="ec2"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux kernel for Amazon EC2 AMI (S3/EBS)"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-ec2-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-ec2-${PVR} )"
+
+src_unpack() {
+        sabayon-kernel_src_unpack
+        if use amd64; then
+                cd "${S}" || die
+                epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+        fi
+}
diff --git a/sys-kernel/linux-beagle/Manifest b/sys-kernel/linux-beagle/Manifest
index e2775f47f..d030c7eed 100644
--- a/sys-kernel/linux-beagle/Manifest
+++ b/sys-kernel/linux-beagle/Manifest
@@ -15,6 +15,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD linux-beagle-3.2-r9.ebuild 578 RMD160 4d07e8a607225c75664224103b4e4e2a0d9c9c52 SHA1 c8d9247114d1f9dfffca163b02b755f7aac36472 SHA256 b3b8ace0cb20deefc410a4eab4b36d353c3b69f3e8da7efe918417b3c1493a2d
 EBUILD linux-beagle-3.3-r1.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
 EBUILD linux-beagle-3.3-r2.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
@@ -31,4 +32,5 @@ EBUILD linux-beagle-3.5-r2.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a1563
 EBUILD linux-beagle-3.5-r3.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
 EBUILD linux-beagle-3.5-r4.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
 EBUILD linux-beagle-3.5-r5.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
+EBUILD linux-beagle-3.5-r6.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
 EBUILD linux-beagle-3.5.ebuild 579 RMD160 11311ea5281a9c551c99e32fe04308a15635ffbb SHA1 feb3772b279ec549902c28a163a5bc9940f9caba SHA256 9d8d79dba1e5d4a3239e8df2674af46d9883015051fbcbb0d9c798574ea7e8ea
diff --git a/sys-kernel/linux-beagle/linux-beagle-3.5-r6.ebuild b/sys-kernel/linux-beagle/linux-beagle-3.5-r6.ebuild
new file mode 100644
index 000000000..319ac1da8
--- /dev/null
+++ b/sys-kernel/linux-beagle/linux-beagle-3.5-r6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/beagle-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon BeagleBoard (not yet Bone) OMAP3 Linux Kernel and modules"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-ec2/Manifest b/sys-kernel/linux-ec2/Manifest
index a53745214..991406e82 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -6,10 +6,12 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD linux-ec2-3.4-r8.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
 EBUILD linux-ec2-3.5-r1.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
 EBUILD linux-ec2-3.5-r2.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
 EBUILD linux-ec2-3.5-r3.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
 EBUILD linux-ec2-3.5-r4.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
 EBUILD linux-ec2-3.5-r5.ebuild 593 RMD160 99c62492cd58a8c78e95f799cc787bdcd66cad0e SHA1 fd651b9b6a8553d835531cacc8f207eb7db29721 SHA256 8822799a0cc8889705f9f8607a805ec36a1e0f6866fc4800eb5be9c41adfa893
+EBUILD linux-ec2-3.5-r6.ebuild 593 RMD160 99c62492cd58a8c78e95f799cc787bdcd66cad0e SHA1 fd651b9b6a8553d835531cacc8f207eb7db29721 SHA256 8822799a0cc8889705f9f8607a805ec36a1e0f6866fc4800eb5be9c41adfa893
 EBUILD linux-ec2-3.5.ebuild 390 RMD160 52989bd43df789a7a22e25ef813cd8d33dfc2ccd SHA1 588f04c03d1b0a3ea22daa5ad7423b63e1ce97e7 SHA256 a8337119afbf7f65916573529b735cf9243e60410986fd479a392c3014818029
diff --git a/sys-kernel/linux-ec2/linux-ec2-3.5-r6.ebuild b/sys-kernel/linux-ec2/linux-ec2-3.5-r6.ebuild
new file mode 100644
index 000000000..9bb69bff6
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-3.5-r6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/ec2-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
+
+src_unpack() {
+        sabayon-kernel_src_unpack
+        if use amd64; then
+                cd "${S}" || die
+                epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+        fi
+}
diff --git a/sys-kernel/linux-panda/Manifest b/sys-kernel/linux-panda/Manifest
index c4475b6bf..6e4716cd7 100644
--- a/sys-kernel/linux-panda/Manifest
+++ b/sys-kernel/linux-panda/Manifest
@@ -15,6 +15,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD linux-panda-3.2-r11.ebuild 560 RMD160 b1ae55e1337e27177c0237e4c780eefec976d0e7 SHA1 26d150be4e8a8a649ac59dea5de10de7eea69301 SHA256 5d63201b90cb16ac419c33437ffedba04a061e732785ca39f4d9f6f2b49b4fef
 EBUILD linux-panda-3.3-r1.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
 EBUILD linux-panda-3.3-r2.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
@@ -31,4 +32,5 @@ EBUILD linux-panda-3.5-r2.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e8409
 EBUILD linux-panda-3.5-r3.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
 EBUILD linux-panda-3.5-r4.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
 EBUILD linux-panda-3.5-r5.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
+EBUILD linux-panda-3.5-r6.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
 EBUILD linux-panda-3.5.ebuild 562 RMD160 6b4ebca232112b39f768cf31a9cc5a3e84095179 SHA1 1642841fd65ede2123c3b81683666610ba6717b9 SHA256 efb8ae0aec1051a7a5fb300e7adb5e0c5ad4ecf189ad14e6ff778bb215057456
diff --git a/sys-kernel/linux-panda/linux-panda-3.5-r6.ebuild b/sys-kernel/linux-panda/linux-panda-3.5-r6.ebuild
new file mode 100644
index 000000000..fce07b2e8
--- /dev/null
+++ b/sys-kernel/linux-panda/linux-panda-3.5-r6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/panda-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon PandaBoard OMAP4 Linux Kernel and modules"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index f3a1ef7e1..85dc10815 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -46,6 +46,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 DIST patch-2.6.37.3.bz2 132880 RMD160 1116504c7ea4a46053fe3a6f7dcd0a82581f9dfc SHA1 7c3d3ded2117b2602275e070d7d0a5c7ad65e7ce SHA256 af6ccb6c85db09e78a85657b1013b2aa1399ef252ce552aafcf25684e6e5ad98
 DIST patch-2.6.38.6.bz2 128175 RMD160 fcafa6e7420139bded0123ffcc21ccda8709c839 SHA1 cc69f739eb5a64a11b11256b7e69139a28fb0777 SHA256 e5bafef2af12fbf47cd8bce3d65b3e10a3dff328be5d589a90a2de0d0b822fd4
 DIST sabayon-2.6.36-r1-amd64.config 116583 RMD160 e089646ec9398182336bb1a88097c611f422135d SHA1 c1c8e2cdfbf24b34aafb858f2441c44b4fd8118b SHA256 cca3b07fb556cd3602787356dcfd9b903145872aadfb9a4782719a8845ad788e
@@ -85,4 +86,5 @@ EBUILD linux-sabayon-3.5-r2.ebuild 340 RMD160 2788508efd78c94286049680a3648c028e
 EBUILD linux-sabayon-3.5-r3.ebuild 340 RMD160 2788508efd78c94286049680a3648c028e0430f4 SHA1 21c77ada54dc731cfab92ee85d89758e95c33590 SHA256 f6189142a5b2f75babcfb16dc76b19bbeb68eec9e1ab4c62692f2bfbc314c6b9
 EBUILD linux-sabayon-3.5-r4.ebuild 340 RMD160 2788508efd78c94286049680a3648c028e0430f4 SHA1 21c77ada54dc731cfab92ee85d89758e95c33590 SHA256 f6189142a5b2f75babcfb16dc76b19bbeb68eec9e1ab4c62692f2bfbc314c6b9
 EBUILD linux-sabayon-3.5-r5.ebuild 543 RMD160 73ec616a53ff09711ab9638f6f664b8a323cf15f SHA1 05d7e3cc08f040bdaf71e073c28a719abcc9f4a8 SHA256 62db2d7186a99a1b4a7554c998089e60f363a3814c580369a75a5be9a3db3ffa
+EBUILD linux-sabayon-3.5-r6.ebuild 543 RMD160 73ec616a53ff09711ab9638f6f664b8a323cf15f SHA1 05d7e3cc08f040bdaf71e073c28a719abcc9f4a8 SHA256 62db2d7186a99a1b4a7554c998089e60f363a3814c580369a75a5be9a3db3ffa
 EBUILD linux-sabayon-3.5.ebuild 470 RMD160 90b8eafb9d6e37749388b88f154a7a7aa7b6d21a SHA1 eb5c4daf35ce89c9e8db4c9a2c0c0c72e9a376ad SHA256 dceb7f7dcb5df4e1ed846789a307e459160d53a18e0a71d357f8cffa84d9d2f8
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.5-r6.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.5-r6.ebuild
new file mode 100644
index 000000000..75ea6cf56
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.5-r6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Standard kernel image"
+RESTRICT="mirror"
+
+src_unpack() {
+        sabayon-kernel_src_unpack
+        if use amd64; then
+                cd "${S}" || die
+                epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+        fi
+}
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index 2d6a4504b..d0307c146 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -40,6 +40,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 DIST patch-2.6.34.10.bz2 383665 RMD160 c68a391711333609a0c6000c27ec2445ff14c4aa SHA1 735f9d0f515762d2fe83872ce59d0c5affaadee1 SHA256 1a7ba6692a233934fc131349ccdf19c272306d3a0b3db01046c76c4e7996d567
 DIST patch-2.6.35.14.bz2 413380 RMD160 d1ea12b9f9f1ed516e71cacbc9fdc8986200ce9b SHA1 a0f88fdb23c174911c666524bbefc04fbe93553b SHA256 57c820dfb7a587c01a90d6317c9d7e2ae1471b923970ad305c384dbb1d67b182
 DIST patch-2.6.36.4.bz2 186814 RMD160 ed06acb39f2e272d388bb04810d0d9626c70fa55 SHA1 7c2cb8f0f7957af3fbc56cbf0a012465cf66c9ec SHA256 77186bff89a5ae7e289b33b7e721921fecd978a2df05b0e69bdafc1a9bfa30f2
@@ -88,4 +89,5 @@ EBUILD linux-server-3.5-r2.ebuild 393 RMD160 00629a15287736823bd9be01a52c4bab479
 EBUILD linux-server-3.5-r3.ebuild 393 RMD160 00629a15287736823bd9be01a52c4bab4796e53d SHA1 f65ccd53597af81f1bafaa3f9ce728f2f6eca96c SHA256 dcb616a8645fbc405dbf2c9d41a104a4766aff89f04f10562c04b6b80942ae70
 EBUILD linux-server-3.5-r4.ebuild 393 RMD160 00629a15287736823bd9be01a52c4bab4796e53d SHA1 f65ccd53597af81f1bafaa3f9ce728f2f6eca96c SHA256 dcb616a8645fbc405dbf2c9d41a104a4766aff89f04f10562c04b6b80942ae70
 EBUILD linux-server-3.5-r5.ebuild 596 RMD160 4f5dd020025de68ba388e0a903ccfc439908134d SHA1 712baf79bf8781b278c3cf3753a52ed67773af17 SHA256 b377ef2feac7e2ba479aeee5123368e6043d9f0a93b8687a9adc93e76a3ad8e9
+EBUILD linux-server-3.5-r6.ebuild 596 RMD160 4f5dd020025de68ba388e0a903ccfc439908134d SHA1 712baf79bf8781b278c3cf3753a52ed67773af17 SHA256 b377ef2feac7e2ba479aeee5123368e6043d9f0a93b8687a9adc93e76a3ad8e9
 EBUILD linux-server-3.5.ebuild 523 RMD160 757f8834ec48d7fa4d3d50680ba341ea33b5d3ad SHA1 13d702ee7fad9a13d73abed00e0afc2c9d19302d SHA256 b3d88be388e84e97a0153f98ea38118d15ec0b184678df9e657be9ebd02dd2d2
diff --git a/sys-kernel/linux-server/linux-server-3.5-r6.ebuild b/sys-kernel/linux-server/linux-server-3.5-r6.ebuild
new file mode 100644
index 000000000..c08a984df
--- /dev/null
+++ b/sys-kernel/linux-server/linux-server-3.5-r6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
+
+src_unpack() {
+        sabayon-kernel_src_unpack
+        if use amd64; then
+                cd "${S}" || die
+                epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+        fi
+}
diff --git a/sys-kernel/panda-sources/Manifest b/sys-kernel/panda-sources/Manifest
index 4e0d338e2..bd215e3fc 100644
--- a/sys-kernel/panda-sources/Manifest
+++ b/sys-kernel/panda-sources/Manifest
@@ -15,6 +15,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 EBUILD panda-sources-3.2-r11.ebuild 583 RMD160 c542e9c187dba2c0e35bfc58652eaead190e6a40 SHA1 8f75a43cabaf00a24e99464a1526283af1838190 SHA256 8705ce7b044895312e3fc707af0f50b09456635a1b8fb053b782fb59d5623b09
 EBUILD panda-sources-3.3-r1.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
 EBUILD panda-sources-3.3-r2.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
@@ -31,4 +32,5 @@ EBUILD panda-sources-3.5-r2.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e1
 EBUILD panda-sources-3.5-r3.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
 EBUILD panda-sources-3.5-r4.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
 EBUILD panda-sources-3.5-r5.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
+EBUILD panda-sources-3.5-r6.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
 EBUILD panda-sources-3.5.ebuild 585 RMD160 7db572ee515edebd8304924c77a5f496e103cd23 SHA1 bbc1b27eb13c91ef2670047d4dd7daa9d72ecb50 SHA256 214d043e2566ca8d74e5a170356022a9ee4106f19e01f057a6f4b44509d30d22
diff --git a/sys-kernel/panda-sources/panda-sources-3.5-r6.ebuild b/sys-kernel/panda-sources/panda-sources-3.5-r6.ebuild
new file mode 100644
index 000000000..aca20c45c
--- /dev/null
+++ b/sys-kernel/panda-sources/panda-sources-3.5-r6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="panda"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon PandaBoard OMAP4 Linux Kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-panda-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-panda-${PVR} )"
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index b0647a372..c25b6cd17 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -46,6 +46,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 DIST patch-2.6.37.3.bz2 132880 RMD160 1116504c7ea4a46053fe3a6f7dcd0a82581f9dfc SHA1 7c3d3ded2117b2602275e070d7d0a5c7ad65e7ce SHA256 af6ccb6c85db09e78a85657b1013b2aa1399ef252ce552aafcf25684e6e5ad98
 DIST patch-2.6.38.6.bz2 128175 RMD160 fcafa6e7420139bded0123ffcc21ccda8709c839 SHA1 cc69f739eb5a64a11b11256b7e69139a28fb0777 SHA256 e5bafef2af12fbf47cd8bce3d65b3e10a3dff328be5d589a90a2de0d0b822fd4
 DIST sabayon-2.6.36-r1-amd64.config 116583 RMD160 e089646ec9398182336bb1a88097c611f422135d SHA1 c1c8e2cdfbf24b34aafb858f2441c44b4fd8118b SHA256 cca3b07fb556cd3602787356dcfd9b903145872aadfb9a4782719a8845ad788e
@@ -85,4 +86,5 @@ EBUILD sabayon-sources-3.5-r2.ebuild 540 RMD160 5ac019305ee03538a3a862110b95d3b8
 EBUILD sabayon-sources-3.5-r3.ebuild 540 RMD160 5ac019305ee03538a3a862110b95d3b860269e68 SHA1 f03c7307ffe703fce66df6019138b6820d998a77 SHA256 e23fd7f8f7348c9b90c1345525abdd55a9f5eba98974336cefb60806913eb3ae
 EBUILD sabayon-sources-3.5-r4.ebuild 713 RMD160 fecb0aa4850bfceaf95d95fbc22862fa9c6d3c7e SHA1 1a72fd8b77df5acbee55c70e76dca5f87b8c2779 SHA256 93d7eec9c2bf1ec5a1eb27ed0686cf085599b583a4bb619c064997c0d2fc1f0b
 EBUILD sabayon-sources-3.5-r5.ebuild 693 RMD160 76e1e83408f7a0d5c884c29f040a4e0b9a345683 SHA1 763b89013d25e7e26270dfb2997c86cda2a9141b SHA256 fc77811a78c9424efa9f51b3e674eae04f8554380629f9d2c11fd4cacef5335d
+EBUILD sabayon-sources-3.5-r6.ebuild 693 RMD160 76e1e83408f7a0d5c884c29f040a4e0b9a345683 SHA1 763b89013d25e7e26270dfb2997c86cda2a9141b SHA256 fc77811a78c9424efa9f51b3e674eae04f8554380629f9d2c11fd4cacef5335d
 EBUILD sabayon-sources-3.5.ebuild 670 RMD160 20ff15870ab3125c0b3952be49aa53a4a60bb5f1 SHA1 a999ce87aaa7e69348a3666ec3dd339bf99c8d78 SHA256 eacaef849ed979a07b52230ed5f901bbf9801cce13505430b93bdbf5b13272c4
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.5-r6.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.5-r6.ebuild
new file mode 100644
index 000000000..69986fa48
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.5-r6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_NAME="sabayon"
+K_SABKERNEL_URI_CONFIG="yes"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Standard kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-sabayon-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-sabayon-${PVR} )"
+
+src_unpack() {
+	sabayon-kernel_src_unpack
+	if use amd64; then
+		cd "${S}" || die
+		epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+	fi
+}
diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/server-sources/Manifest
index 0ebf0f359..ef37bc901 100644
--- a/sys-kernel/server-sources/Manifest
+++ b/sys-kernel/server-sources/Manifest
@@ -42,6 +42,7 @@ DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
 DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 DIST linux-3.5-r5+sabayon.tar.bz2 82418175 RMD160 7bc807b7a7da4e1f6c60789c1cbbecc9eafdcae7 SHA1 c5d7e994deadd29f8567b860faaad64f8a4a0fa0 SHA256 9376647822023489be49abc09fe0a8ef1432820b2a4052d3bd1bdbfaedeb1bb3
+DIST linux-3.5-r6+sabayon.tar.bz2 82386314 RMD160 1096187f328784628cc7586a835286d63b728f04 SHA1 6c7d2e8fc3152e43349d22411dcbd6c1919db565 SHA256 93f1dbe351665af7e381fc9004c5f15c8c5d105577e1c1cc1f837629e8d328c4
 DIST patch-2.6.34.10.bz2 383665 RMD160 c68a391711333609a0c6000c27ec2445ff14c4aa SHA1 735f9d0f515762d2fe83872ce59d0c5affaadee1 SHA256 1a7ba6692a233934fc131349ccdf19c272306d3a0b3db01046c76c4e7996d567
 DIST patch-2.6.35.14.bz2 413380 RMD160 d1ea12b9f9f1ed516e71cacbc9fdc8986200ce9b SHA1 a0f88fdb23c174911c666524bbefc04fbe93553b SHA256 57c820dfb7a587c01a90d6317c9d7e2ae1471b923970ad305c384dbb1d67b182
 DIST patch-2.6.36.4.bz2 186814 RMD160 ed06acb39f2e272d388bb04810d0d9626c70fa55 SHA1 7c2cb8f0f7957af3fbc56cbf0a012465cf66c9ec SHA256 77186bff89a5ae7e289b33b7e721921fecd978a2df05b0e69bdafc1a9bfa30f2
@@ -92,4 +93,5 @@ EBUILD server-sources-3.5-r2.ebuild 505 RMD160 99c8d88615a817cdc89a671bcc037a810
 EBUILD server-sources-3.5-r3.ebuild 505 RMD160 99c8d88615a817cdc89a671bcc037a81070fb87a SHA1 e114c744af5c3526c4986193a4e3948e19d59cd4 SHA256 7dca57ee9c5f71c40fca88ec0e6f66c2b1023649d51123145a4ab50c74639457
 EBUILD server-sources-3.5-r4.ebuild 679 RMD160 a471502ee05bfd846ce0995ea0bc09cff75c3857 SHA1 5ca969ed2c9ce2f3cff25f265ff6f9d115797e21 SHA256 8f448abe5025ecd632c9d8b4f500942c3e8b64780181627b9ae94ddfacc92430
 EBUILD server-sources-3.5-r5.ebuild 708 RMD160 dbd99a990b4f2a8db81fd33fd1bab9b295d33d63 SHA1 4de2ca60c42d06a7c4c3e85aeafe52757b77b779 SHA256 cb482d3a06eb8ceb89685ce03c4f905f6944b4a10b5e9a7cefabfdc0e458424c
+EBUILD server-sources-3.5-r6.ebuild 708 RMD160 dbd99a990b4f2a8db81fd33fd1bab9b295d33d63 SHA1 4de2ca60c42d06a7c4c3e85aeafe52757b77b779 SHA256 cb482d3a06eb8ceb89685ce03c4f905f6944b4a10b5e9a7cefabfdc0e458424c
 EBUILD server-sources-3.5.ebuild 635 RMD160 ea3a5d6eb1d77e5484e1b8caa48df1bc998925a0 SHA1 a67e501aa064d9fb07a1c9449f3b92be575476b7 SHA256 7dfde7d9ba6cf23511cd39e1ce0d9530144747fb6a370fbbe9c2ab1f5a5c4652
diff --git a/sys-kernel/server-sources/server-sources-3.5-r6.ebuild b/sys-kernel/server-sources/server-sources-3.5-r6.ebuild
new file mode 100644
index 000000000..c74941118
--- /dev/null
+++ b/sys-kernel/server-sources/server-sources-3.5-r6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="server"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"
+
+src_unpack() {
+        sabayon-kernel_src_unpack
+        if use amd64; then
+                cd "${S}" || die
+                epatch "${FILESDIR}/__pte_alloc_kernel-gentoo-bug-416685.patch"
+        fi
+}