diff --git a/sys-kernel/ec2-sources/Manifest b/sys-kernel/ec2-sources/Manifest
index c1c53bb3a..d75a16706 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -30,6 +30,7 @@ DIST 4.0-sabayon-4.0.5.patch.xz 193564 SHA256 584da65b6a251f6411fe9d3242b727e8cf
 DIST 4.0-sabayon-4.0.6.patch.xz 220100 SHA256 276f3ae8368ed379097415943f68d0493dd7846cb43157a5e224b0196385d7d1 SHA512 2cbc0996d8daca209c3ddb3e340690cab2884081b4d0c4c6b0d2ef0f553af4252d09dd353680d37920fade4b19766ca86ec048bfd1a5c5eb07261e2ffdab49c5 WHIRLPOOL 29934fedc66af347736e8eef235eb1442e3f50e7031f73b9b56ee07d64e102b14bf73936529079433485fe62cea7ac5bc8348b575dfa279bdcb42922b69fa93b
 DIST 4.0-sabayon-4.0.7.patch.xz 225040 SHA256 97854720901c6e197d7cf89d682c12a7ed55ca1f8632ae431176fa35ce765fd5 SHA512 686f7d76fe3399865bc748ed79c613e16808b95bcc05392206935738ec8d8e01185e17809b55c5a5638bcee896fe94f8100e309046c2374fd28a6a28f790d138 WHIRLPOOL d9caa5ad782dd1b4308ff9922353a3c378fb0e23c91f7faa002747c0b60f6a3c91aad9d2bbbfbea73dc51667cc7b8d7e63be42ea54357e62dcb09e423a769cf7
 DIST 4.0-sabayon-4.0.8.patch.xz 240352 SHA256 64cb7dfc6adb62ff04263c5fa7eac276f9eb36d4745a68674823ca3f26e80996 SHA512 4d9f0df77c34472da46891ccfb7d6fb4ceb31167c10b2db5ef5ff9ee489d67edc79e9d93c6a72f4f8f6420a10edc32ece9e2230f363fd7d226973bead51a7a2f WHIRLPOOL 5d9746866c297db8fc3803167ded93cee3a820e12a04f7677cad7c1c2804053a4353651d72e08f0420209d0203ace0e8e6f64c2f044452cb8df78b574b6deac0
+DIST 4.0-sabayon-4.0.9.patch.xz 264568 SHA256 90945b06e5ff48a5bd58f128adf6a151da930b1b4af23ff265c81e0ca3a06129 SHA512 ac07ac573ece4347576b14fdaf6477c239f24ef9f90cf10abbd72cf891fde677815730274258031bbe61aceab32240e05447763046377a77c06a2d16dca23094 WHIRLPOOL 2555da6de13ddd3dd7207f6210482c15ea0bd71cb6a5ac45bfeb437cebfa7b1e96e6b02145f19a82d8a8242e4b8682075b0ed6b20c8db5c5a75fbecd81ccde38
 DIST 4.1-sabayon-4.1.patch.xz 44444 SHA256 14337afb212b0a34a381835a730d17e35cd6faad7df457c7f34b306828221a36 SHA512 610ef20cafca79285be6cd25ce7f7275fee1e8c7c2fb244203dbdcf21da529c3ae6a45e835510468daa2b3ab3e5e7077b9402c63296a5a4b3edd58dbf2e20fad WHIRLPOOL 791e9b4c8695f3cc89e46c32fd9879c0f50f4faccd8f843bf63241190ff3f36ce16df028c5936b31523ba7847e1f66b67938059eef4c764999e5283d4a67f9c3
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.10+sabayon.tar.xz 77730768 SHA256 6ed44a255753a937fffeda766888c88e26356ecb55419fdc342274ae6c8db372 SHA512 e8de34f85a2da7979babfca1e5bf05c61492ae8e503d899193b9e91111ccf56d423db35925b2b23f7c6e02b57972777945ad2032eb9b5bda5996e8afbaa07383 WHIRLPOOL e6ab4532bfe62b1ca9d7e7f69bdad66db23b756dc8ecea335b0cd7ed47b4c830e07b705311ef41f5b347afce5d40b05730452df13bc56713309ab1287590315b
diff --git a/sys-kernel/ec2-sources/ec2-sources-4.0.9.ebuild b/sys-kernel/ec2-sources/ec2-sources-4.0.9.ebuild
new file mode 100644
index 000000000..8386e5d23
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-4.0.9.ebuild
@@ -0,0 +1,21 @@
+# 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"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+
+inherit sabayon-kernel
+KEYWORDS="~amd64"
+DESCRIPTION="Official Sabayon Linux kernel sources for Amazon EC2"
+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-ec2/Manifest b/sys-kernel/linux-ec2/Manifest
index c1c53bb3a..d75a16706 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -30,6 +30,7 @@ DIST 4.0-sabayon-4.0.5.patch.xz 193564 SHA256 584da65b6a251f6411fe9d3242b727e8cf
 DIST 4.0-sabayon-4.0.6.patch.xz 220100 SHA256 276f3ae8368ed379097415943f68d0493dd7846cb43157a5e224b0196385d7d1 SHA512 2cbc0996d8daca209c3ddb3e340690cab2884081b4d0c4c6b0d2ef0f553af4252d09dd353680d37920fade4b19766ca86ec048bfd1a5c5eb07261e2ffdab49c5 WHIRLPOOL 29934fedc66af347736e8eef235eb1442e3f50e7031f73b9b56ee07d64e102b14bf73936529079433485fe62cea7ac5bc8348b575dfa279bdcb42922b69fa93b
 DIST 4.0-sabayon-4.0.7.patch.xz 225040 SHA256 97854720901c6e197d7cf89d682c12a7ed55ca1f8632ae431176fa35ce765fd5 SHA512 686f7d76fe3399865bc748ed79c613e16808b95bcc05392206935738ec8d8e01185e17809b55c5a5638bcee896fe94f8100e309046c2374fd28a6a28f790d138 WHIRLPOOL d9caa5ad782dd1b4308ff9922353a3c378fb0e23c91f7faa002747c0b60f6a3c91aad9d2bbbfbea73dc51667cc7b8d7e63be42ea54357e62dcb09e423a769cf7
 DIST 4.0-sabayon-4.0.8.patch.xz 240352 SHA256 64cb7dfc6adb62ff04263c5fa7eac276f9eb36d4745a68674823ca3f26e80996 SHA512 4d9f0df77c34472da46891ccfb7d6fb4ceb31167c10b2db5ef5ff9ee489d67edc79e9d93c6a72f4f8f6420a10edc32ece9e2230f363fd7d226973bead51a7a2f WHIRLPOOL 5d9746866c297db8fc3803167ded93cee3a820e12a04f7677cad7c1c2804053a4353651d72e08f0420209d0203ace0e8e6f64c2f044452cb8df78b574b6deac0
+DIST 4.0-sabayon-4.0.9.patch.xz 264568 SHA256 90945b06e5ff48a5bd58f128adf6a151da930b1b4af23ff265c81e0ca3a06129 SHA512 ac07ac573ece4347576b14fdaf6477c239f24ef9f90cf10abbd72cf891fde677815730274258031bbe61aceab32240e05447763046377a77c06a2d16dca23094 WHIRLPOOL 2555da6de13ddd3dd7207f6210482c15ea0bd71cb6a5ac45bfeb437cebfa7b1e96e6b02145f19a82d8a8242e4b8682075b0ed6b20c8db5c5a75fbecd81ccde38
 DIST 4.1-sabayon-4.1.patch.xz 44444 SHA256 14337afb212b0a34a381835a730d17e35cd6faad7df457c7f34b306828221a36 SHA512 610ef20cafca79285be6cd25ce7f7275fee1e8c7c2fb244203dbdcf21da529c3ae6a45e835510468daa2b3ab3e5e7077b9402c63296a5a4b3edd58dbf2e20fad WHIRLPOOL 791e9b4c8695f3cc89e46c32fd9879c0f50f4faccd8f843bf63241190ff3f36ce16df028c5936b31523ba7847e1f66b67938059eef4c764999e5283d4a67f9c3
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.10+sabayon.tar.xz 77730768 SHA256 6ed44a255753a937fffeda766888c88e26356ecb55419fdc342274ae6c8db372 SHA512 e8de34f85a2da7979babfca1e5bf05c61492ae8e503d899193b9e91111ccf56d423db35925b2b23f7c6e02b57972777945ad2032eb9b5bda5996e8afbaa07383 WHIRLPOOL e6ab4532bfe62b1ca9d7e7f69bdad66db23b756dc8ecea335b0cd7ed47b4c830e07b705311ef41f5b347afce5d40b05730452df13bc56713309ab1287590315b
diff --git a/sys-kernel/linux-ec2/linux-ec2-4.0.9.ebuild b/sys-kernel/linux-ec2/linux-ec2-4.0.9.ebuild
new file mode 100644
index 000000000..f926c3d66
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-4.0.9.ebuild
@@ -0,0 +1,16 @@
+# 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="20150320"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+
+inherit sabayon-kernel
+KEYWORDS="~amd64"
+DESCRIPTION="Official Sabayon Linux kernel image for Amazon EC2"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index 86e1f777a..94a7605e0 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -28,6 +28,7 @@ DIST 4.0-sabayon-4.0.5.patch.xz 193564 SHA256 584da65b6a251f6411fe9d3242b727e8cf
 DIST 4.0-sabayon-4.0.6.patch.xz 220100 SHA256 276f3ae8368ed379097415943f68d0493dd7846cb43157a5e224b0196385d7d1 SHA512 2cbc0996d8daca209c3ddb3e340690cab2884081b4d0c4c6b0d2ef0f553af4252d09dd353680d37920fade4b19766ca86ec048bfd1a5c5eb07261e2ffdab49c5 WHIRLPOOL 29934fedc66af347736e8eef235eb1442e3f50e7031f73b9b56ee07d64e102b14bf73936529079433485fe62cea7ac5bc8348b575dfa279bdcb42922b69fa93b
 DIST 4.0-sabayon-4.0.7.patch.xz 225040 SHA256 97854720901c6e197d7cf89d682c12a7ed55ca1f8632ae431176fa35ce765fd5 SHA512 686f7d76fe3399865bc748ed79c613e16808b95bcc05392206935738ec8d8e01185e17809b55c5a5638bcee896fe94f8100e309046c2374fd28a6a28f790d138 WHIRLPOOL d9caa5ad782dd1b4308ff9922353a3c378fb0e23c91f7faa002747c0b60f6a3c91aad9d2bbbfbea73dc51667cc7b8d7e63be42ea54357e62dcb09e423a769cf7
 DIST 4.0-sabayon-4.0.8.patch.xz 240352 SHA256 64cb7dfc6adb62ff04263c5fa7eac276f9eb36d4745a68674823ca3f26e80996 SHA512 4d9f0df77c34472da46891ccfb7d6fb4ceb31167c10b2db5ef5ff9ee489d67edc79e9d93c6a72f4f8f6420a10edc32ece9e2230f363fd7d226973bead51a7a2f WHIRLPOOL 5d9746866c297db8fc3803167ded93cee3a820e12a04f7677cad7c1c2804053a4353651d72e08f0420209d0203ace0e8e6f64c2f044452cb8df78b574b6deac0
+DIST 4.0-sabayon-4.0.9.patch.xz 264568 SHA256 90945b06e5ff48a5bd58f128adf6a151da930b1b4af23ff265c81e0ca3a06129 SHA512 ac07ac573ece4347576b14fdaf6477c239f24ef9f90cf10abbd72cf891fde677815730274258031bbe61aceab32240e05447763046377a77c06a2d16dca23094 WHIRLPOOL 2555da6de13ddd3dd7207f6210482c15ea0bd71cb6a5ac45bfeb437cebfa7b1e96e6b02145f19a82d8a8242e4b8682075b0ed6b20c8db5c5a75fbecd81ccde38
 DIST 4.1-sabayon-4.1.patch.xz 44444 SHA256 14337afb212b0a34a381835a730d17e35cd6faad7df457c7f34b306828221a36 SHA512 610ef20cafca79285be6cd25ce7f7275fee1e8c7c2fb244203dbdcf21da529c3ae6a45e835510468daa2b3ab3e5e7077b9402c63296a5a4b3edd58dbf2e20fad WHIRLPOOL 791e9b4c8695f3cc89e46c32fd9879c0f50f4faccd8f843bf63241190ff3f36ce16df028c5936b31523ba7847e1f66b67938059eef4c764999e5283d4a67f9c3
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.10+sabayon.tar.xz 77730768 SHA256 6ed44a255753a937fffeda766888c88e26356ecb55419fdc342274ae6c8db372 SHA512 e8de34f85a2da7979babfca1e5bf05c61492ae8e503d899193b9e91111ccf56d423db35925b2b23f7c6e02b57972777945ad2032eb9b5bda5996e8afbaa07383 WHIRLPOOL e6ab4532bfe62b1ca9d7e7f69bdad66db23b756dc8ecea335b0cd7ed47b4c830e07b705311ef41f5b347afce5d40b05730452df13bc56713309ab1287590315b
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-4.0.9.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-4.0.9.ebuild
new file mode 100644
index 000000000..41feb8b7e
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-4.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2004-2013 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator
+
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+K_KERNEL_NEW_VERSIONING="1"
+
+inherit sabayon-kernel
+
+KEYWORDS="~amd64"
+DESCRIPTION="Official Sabayon Linux Standard kernel image"
+RESTRICT="mirror"
+
+DEPEND="${DEPEND}
+	sys-apps/v86d"
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index 86e1f777a..94a7605e0 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -28,6 +28,7 @@ DIST 4.0-sabayon-4.0.5.patch.xz 193564 SHA256 584da65b6a251f6411fe9d3242b727e8cf
 DIST 4.0-sabayon-4.0.6.patch.xz 220100 SHA256 276f3ae8368ed379097415943f68d0493dd7846cb43157a5e224b0196385d7d1 SHA512 2cbc0996d8daca209c3ddb3e340690cab2884081b4d0c4c6b0d2ef0f553af4252d09dd353680d37920fade4b19766ca86ec048bfd1a5c5eb07261e2ffdab49c5 WHIRLPOOL 29934fedc66af347736e8eef235eb1442e3f50e7031f73b9b56ee07d64e102b14bf73936529079433485fe62cea7ac5bc8348b575dfa279bdcb42922b69fa93b
 DIST 4.0-sabayon-4.0.7.patch.xz 225040 SHA256 97854720901c6e197d7cf89d682c12a7ed55ca1f8632ae431176fa35ce765fd5 SHA512 686f7d76fe3399865bc748ed79c613e16808b95bcc05392206935738ec8d8e01185e17809b55c5a5638bcee896fe94f8100e309046c2374fd28a6a28f790d138 WHIRLPOOL d9caa5ad782dd1b4308ff9922353a3c378fb0e23c91f7faa002747c0b60f6a3c91aad9d2bbbfbea73dc51667cc7b8d7e63be42ea54357e62dcb09e423a769cf7
 DIST 4.0-sabayon-4.0.8.patch.xz 240352 SHA256 64cb7dfc6adb62ff04263c5fa7eac276f9eb36d4745a68674823ca3f26e80996 SHA512 4d9f0df77c34472da46891ccfb7d6fb4ceb31167c10b2db5ef5ff9ee489d67edc79e9d93c6a72f4f8f6420a10edc32ece9e2230f363fd7d226973bead51a7a2f WHIRLPOOL 5d9746866c297db8fc3803167ded93cee3a820e12a04f7677cad7c1c2804053a4353651d72e08f0420209d0203ace0e8e6f64c2f044452cb8df78b574b6deac0
+DIST 4.0-sabayon-4.0.9.patch.xz 264568 SHA256 90945b06e5ff48a5bd58f128adf6a151da930b1b4af23ff265c81e0ca3a06129 SHA512 ac07ac573ece4347576b14fdaf6477c239f24ef9f90cf10abbd72cf891fde677815730274258031bbe61aceab32240e05447763046377a77c06a2d16dca23094 WHIRLPOOL 2555da6de13ddd3dd7207f6210482c15ea0bd71cb6a5ac45bfeb437cebfa7b1e96e6b02145f19a82d8a8242e4b8682075b0ed6b20c8db5c5a75fbecd81ccde38
 DIST 4.1-sabayon-4.1.patch.xz 44444 SHA256 14337afb212b0a34a381835a730d17e35cd6faad7df457c7f34b306828221a36 SHA512 610ef20cafca79285be6cd25ce7f7275fee1e8c7c2fb244203dbdcf21da529c3ae6a45e835510468daa2b3ab3e5e7077b9402c63296a5a4b3edd58dbf2e20fad WHIRLPOOL 791e9b4c8695f3cc89e46c32fd9879c0f50f4faccd8f843bf63241190ff3f36ce16df028c5936b31523ba7847e1f66b67938059eef4c764999e5283d4a67f9c3
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.10+sabayon.tar.xz 77730768 SHA256 6ed44a255753a937fffeda766888c88e26356ecb55419fdc342274ae6c8db372 SHA512 e8de34f85a2da7979babfca1e5bf05c61492ae8e503d899193b9e91111ccf56d423db35925b2b23f7c6e02b57972777945ad2032eb9b5bda5996e8afbaa07383 WHIRLPOOL e6ab4532bfe62b1ca9d7e7f69bdad66db23b756dc8ecea335b0cd7ed47b4c830e07b705311ef41f5b347afce5d40b05730452df13bc56713309ab1287590315b
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-4.0.9.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-4.0.9.ebuild
new file mode 100644
index 000000000..aa17b6fa6
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-4.0.9.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_NAME="sabayon"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+
+inherit sabayon-kernel
+
+KEYWORDS="~amd64"
+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} )"