diff --git a/sys-kernel/beagle-sources/Manifest b/sys-kernel/beagle-sources/Manifest
index cc9f9698a..c84ee9c36 100644
--- a/sys-kernel/beagle-sources/Manifest
+++ b/sys-kernel/beagle-sources/Manifest
@@ -31,3 +31,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/beagle-sources/beagle-sources-3.8.4.ebuild b/sys-kernel/beagle-sources/beagle-sources-3.8.4.ebuild
new file mode 100644
index 000000000..732b13dc0
--- /dev/null
+++ b/sys-kernel/beagle-sources/beagle-sources-3.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="beagle"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-armv7.config"
+K_KERNEL_NEW_VERSIONING="1"
+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 e197b781b..1da9e0e2b 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -5,3 +5,4 @@ DIST linux-3.7.3+sabayon.tar.xz 73384228 SHA256 df7a336b06bcd9d861b80961b994922b
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/ec2-sources/ec2-sources-3.8.4.ebuild b/sys-kernel/ec2-sources/ec2-sources-3.8.4.ebuild
new file mode 100644
index 000000000..c98073884
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-3.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="ec2"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+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} )"
diff --git a/sys-kernel/linux-beagle/Manifest b/sys-kernel/linux-beagle/Manifest
index cc9f9698a..c84ee9c36 100644
--- a/sys-kernel/linux-beagle/Manifest
+++ b/sys-kernel/linux-beagle/Manifest
@@ -31,3 +31,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/linux-beagle/linux-beagle-3.8.4.ebuild b/sys-kernel/linux-beagle/linux-beagle-3.8.4.ebuild
new file mode 100644
index 000000000..4e12cb30c
--- /dev/null
+++ b/sys-kernel/linux-beagle/linux-beagle-3.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/beagle-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20130113"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-armv7.config"
+K_KERNEL_NEW_VERSIONING="1"
+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 69bc68023..37eaf1a52 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -6,3 +6,4 @@ DIST linux-3.7.3+sabayon.tar.xz 73384228 SHA256 df7a336b06bcd9d861b80961b994922b
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/linux-ec2/linux-ec2-3.8.4.ebuild b/sys-kernel/linux-ec2/linux-ec2-3.8.4.ebuild
new file mode 100644
index 000000000..7f898f048
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-3.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/ec2-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20130113"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-panda/Manifest b/sys-kernel/linux-panda/Manifest
index 3dcadfe7b..bbbde23a1 100644
--- a/sys-kernel/linux-panda/Manifest
+++ b/sys-kernel/linux-panda/Manifest
@@ -31,3 +31,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/linux-panda/linux-panda-3.8.4.ebuild b/sys-kernel/linux-panda/linux-panda-3.8.4.ebuild
new file mode 100644
index 000000000..6a229b6eb
--- /dev/null
+++ b/sys-kernel/linux-panda/linux-panda-3.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/panda-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20130113"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-armv7.config"
+K_KERNEL_NEW_VERSIONING="1"
+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 b534508fb..8b53815af 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -42,3 +42,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.8.4.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.8.4.ebuild
new file mode 100644
index 000000000..cc0f491db
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_REQUIRED_LINUX_FIRMWARE_VER="20130113"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ZFS="1"
+K_KERNEL_NEW_VERSIONING="1"
+inherit sabayon-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Standard kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index b534508fb..8b53815af 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -42,3 +42,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/linux-server/linux-server-3.8.4.ebuild b/sys-kernel/linux-server/linux-server-3.8.4.ebuild
new file mode 100644
index 000000000..b20857ddd
--- /dev/null
+++ b/sys-kernel/linux-server/linux-server-3.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20130113"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ZFS="1"
+K_KERNEL_NEW_VERSIONING="1"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/panda-sources/Manifest b/sys-kernel/panda-sources/Manifest
index 3dcadfe7b..bbbde23a1 100644
--- a/sys-kernel/panda-sources/Manifest
+++ b/sys-kernel/panda-sources/Manifest
@@ -31,3 +31,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/panda-sources/panda-sources-3.8.4.ebuild b/sys-kernel/panda-sources/panda-sources-3.8.4.ebuild
new file mode 100644
index 000000000..9da37ad1f
--- /dev/null
+++ b/sys-kernel/panda-sources/panda-sources-3.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="panda"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-armv7.config"
+K_KERNEL_NEW_VERSIONING="1"
+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 b534508fb..8b53815af 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -42,3 +42,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.8.4.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.8.4.ebuild
new file mode 100644
index 000000000..1535343e5
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_NAME="sabayon"
+K_SABKERNEL_URI_CONFIG="yes"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+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} )"
diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/server-sources/Manifest
index b534508fb..8b53815af 100644
--- a/sys-kernel/server-sources/Manifest
+++ b/sys-kernel/server-sources/Manifest
@@ -42,3 +42,4 @@ DIST linux-3.7.4+sabayon.tar.xz 73395496 SHA256 5262ae3b901cef1d643df842718b3ee7
 DIST linux-3.8+sabayon.tar.xz 74436572 SHA256 d9b7dd6bbb554320a694c841f510d921ea1387c33f0eac5cb3184fd72f4e85e4 SHA512 89f00c30aaf7426d44e120d62c6e993ed378e53400d4cc081ea7e911181242f15240d940f71d0afda74ff6a771834b0545b2eed620952f851208294836af7db6 WHIRLPOOL c6efcbe4f7f1b5194b6402d6e8af3bd5d2e68d8cb0f337e4d082e8cf0eb4bad2e92c6bb41d8714ee8b2a1573754321827e203bddd982306205bf3768622ddb5e
 DIST linux-3.8.2+sabayon.tar.xz 74445112 SHA256 e5c17e16beccf1ad2093f60cec315d18167ec8678dd8317fd8b68dd2ae4fe5ce SHA512 6e8167ea76393032e95cc610ecd8510a5d41bb16551f912c7693ff5599b8d9f132965c395c36f303646fb5ac9cf8f0cc09c6b97b3ca8af8a108edc42a4fd875b WHIRLPOOL 783ae45b952e0cf799cc902472ec3e7afeb0e970007666964bd98fbbe2665854262ab2af3035147f6aad0a95571a2942bba4f31ef6fc76984f5f7584201ed3cc
 DIST linux-3.8.3+sabayon.tar.xz 74452420 SHA256 ff6d43a0e9252de10298dc2de9805d7905014244c5cbc357b6e47ffa9230b835 SHA512 e3f1795272a535e21f6570288d4b8111db12c7d300f6fe8cdbb1d22c874753b4666fe3ed575004561f7780204f4589841ecaa05a5894274baa6b1f5e547e56e3 WHIRLPOOL 9d4d556e2cc06a60582bac62d94fd0fd9f05c98b6b7865d3c359f6bb79202524ede97914b30ccd6aebd85def8ab0ba3795612a24ee8e606e63c74cb539fcc1ca
+DIST linux-3.8.4+sabayon.tar.xz 74440740 SHA256 2ee3b8b713652f219802592b6a3d4b3c3cd91f4dc8e5eaace7ac134865a5ca03 SHA512 3c08c37943733f1e7f15da6c885b63888d52514bb2eba567c3b3a5eabf14e880cfc0c7741e28bd270d89255e6865bd229521e713e27995bab45ad00795633cb1 WHIRLPOOL e1180000dc4a87f78bae681d69a596a0e3b18d6b413afe2634c5501c330cebad18c3781304643a98c8808ba1a23c59f756a25f26a7a8e9ac8d374e11d9a5a91b
diff --git a/sys-kernel/server-sources/server-sources-3.8.4.ebuild b/sys-kernel/server-sources/server-sources-3.8.4.ebuild
new file mode 100644
index 000000000..6c1e28352
--- /dev/null
+++ b/sys-kernel/server-sources/server-sources-3.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="server"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+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} )"