diff --git a/sys-kernel/ec2-sources/Manifest b/sys-kernel/ec2-sources/Manifest
index b13ba9bd6..e11d7a418 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -3,6 +3,7 @@ DIST 3.10-sabayon-3.10.54.patch.xz 1150020 SHA256 715d02e489bc42a4036c4461569a05
 DIST 3.10-sabayon-3.10.55.patch.xz 1171072 SHA256 18337bea6328f93980186982ea0780f3cad750dce70b9325c349b6a0dbfa3836 SHA512 90e10da15cea4d645bf55dccb105a5a882350fc9872b510310022e5bca94595bd89c7e35ec72a561ccb1d82865f0c844a16d78fd73abe547bec96fcc1ca79b8d WHIRLPOOL d08db0ef012bcf5495a3977a7cd9a9cf927a1512ae267a3bc2bc3f3bb274b55c937fac7308516dd8d12bb6daab7fa588cbc0361365de4ea8fb27bfc6936877fb
 DIST 3.10-sabayon-3.10.56.patch.xz 1196944 SHA256 93236c0b320129d5af563d08ae8e84daf196462d839e3d31c4b002362b2aef02 SHA512 7456902aae5ce316873ce93cee381f705b48ceac4892e330c07a565e9dcee6442e0863e9c3df265542a2ce5ab741e00e3cd92020ce1f11d9a20ccba9793b5934 WHIRLPOOL c4318d4af05bbb22fc545deae92e25160a6bdbb096ed9ab19d20775fdb012a4aadee68c9e9528a1aa6af7e04216018b8332502e9594d989107b0c7b5d4bd4951
 DIST 3.10-sabayon-3.10.57.patch.xz 1201696 SHA256 21ce3d8f6e4e8861c3ef99028425812ffc7f6c331e7cd3639c482c0f0e3c022d SHA512 2b1d2f6aa2db09d068a0550b8c2e760dc097dc4048d563c87333643120597bdd2b797bb276367743a5e283216219c03b89d08ed9372822198f3ceca122ea2192 WHIRLPOOL 61ae5689ca0da51ca3aa07ba849a86c2afa62b942c0695f38cdf7280aed98502ff52698a7a1d77b9833cceb657564b02d8d89d14ec30fa025f78312a1a536b0d
+DIST 3.10-sabayon-3.10.58.patch.xz 1205828 SHA256 c944b0ff7952aa53479b0a31509786ceb2a8d919dee1fcbd367c3e44dcdb669b SHA512 7e8b54ae8560183569b4968513694cd3b1197226aa21e4ff765746f4ae5150e2f321954ed3cb67f0cd239e77777b2b6954b0ef26a8c8317f9731fc9057f7630e WHIRLPOOL 803c89948ff7589dc045562922e9cbea37c3a81a1973fe16005b8ee1ce62b00f998f2a6a42d2aad751ae3f659839954ac69c5fc01533178aaa09010ad530460b
 DIST 3.12-sabayon-3.12.26.patch.xz 1031768 SHA256 f2411168f128f2069fe01c4be20a2401b55394f78e9c6f6bbd8ae58e6ce8b4de SHA512 f3e94c5f1c727c45e094169f3368a4fcbbc0a4579920a30aafd641f34b291443149906a3c1136ef36c0ff6e5574497b33cf2a9c166ac2f1b8b098a127223c0c2 WHIRLPOOL 8233407de42573ddca89bfbd8ef8ede9394916a7036f9c5a006a458a9dd3b1ca3703fe4dc6ae67898ef7e55e57447ddf7898de4c2c7be63bc5dfcabf752a2ec3
 DIST 3.12-sabayon-3.12.27.patch.xz 1061772 SHA256 2feea44d233a382f7a95c2ae198c884ef0cd0663764c286674bd5d1946b83a6a SHA512 f1a92e5a787a9326701948d1962d106402d57eed7994df95760e348078cd203d4c70f1d5a36356240e0537ea4b5e99512211fbf4655cf57b98f5f3c65c26cbe4 WHIRLPOOL 7ff7492c36cad0f181cfa881160fbe6c74e7883db3db013c70527f40060fb10026acdac5431e6325e700bd55939142aa2202b575becdf9004e21d79d1b211e12
 DIST 3.12-sabayon-3.12.28.patch.xz 1075160 SHA256 0650651dfedc625e29a902e1ed47cbafc55dd9276b35e719c584288ac79acd83 SHA512 8362fd22b450b86a43da6341f646d6426557691e4141b74d73f446f75789766b4d8ca3c5b4bd2adbf237616857bcc1220644376393d1d11693d7755708a574cb WHIRLPOOL ae7ef147967f030d1a40e1348b3a1b32350d132f3ceb8961bf29388c662a04d13e3950e10119c49c18e6f95a84c1a9d4e258fdb9fb1adacacc23d064c6ad548e
diff --git a/sys-kernel/ec2-sources/ec2-sources-3.10.58.ebuild b/sys-kernel/ec2-sources/ec2-sources-3.10.58.ebuild
new file mode 100644
index 000000000..8386e5d23
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-3.10.58.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 b13ba9bd6..e11d7a418 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -3,6 +3,7 @@ DIST 3.10-sabayon-3.10.54.patch.xz 1150020 SHA256 715d02e489bc42a4036c4461569a05
 DIST 3.10-sabayon-3.10.55.patch.xz 1171072 SHA256 18337bea6328f93980186982ea0780f3cad750dce70b9325c349b6a0dbfa3836 SHA512 90e10da15cea4d645bf55dccb105a5a882350fc9872b510310022e5bca94595bd89c7e35ec72a561ccb1d82865f0c844a16d78fd73abe547bec96fcc1ca79b8d WHIRLPOOL d08db0ef012bcf5495a3977a7cd9a9cf927a1512ae267a3bc2bc3f3bb274b55c937fac7308516dd8d12bb6daab7fa588cbc0361365de4ea8fb27bfc6936877fb
 DIST 3.10-sabayon-3.10.56.patch.xz 1196944 SHA256 93236c0b320129d5af563d08ae8e84daf196462d839e3d31c4b002362b2aef02 SHA512 7456902aae5ce316873ce93cee381f705b48ceac4892e330c07a565e9dcee6442e0863e9c3df265542a2ce5ab741e00e3cd92020ce1f11d9a20ccba9793b5934 WHIRLPOOL c4318d4af05bbb22fc545deae92e25160a6bdbb096ed9ab19d20775fdb012a4aadee68c9e9528a1aa6af7e04216018b8332502e9594d989107b0c7b5d4bd4951
 DIST 3.10-sabayon-3.10.57.patch.xz 1201696 SHA256 21ce3d8f6e4e8861c3ef99028425812ffc7f6c331e7cd3639c482c0f0e3c022d SHA512 2b1d2f6aa2db09d068a0550b8c2e760dc097dc4048d563c87333643120597bdd2b797bb276367743a5e283216219c03b89d08ed9372822198f3ceca122ea2192 WHIRLPOOL 61ae5689ca0da51ca3aa07ba849a86c2afa62b942c0695f38cdf7280aed98502ff52698a7a1d77b9833cceb657564b02d8d89d14ec30fa025f78312a1a536b0d
+DIST 3.10-sabayon-3.10.58.patch.xz 1205828 SHA256 c944b0ff7952aa53479b0a31509786ceb2a8d919dee1fcbd367c3e44dcdb669b SHA512 7e8b54ae8560183569b4968513694cd3b1197226aa21e4ff765746f4ae5150e2f321954ed3cb67f0cd239e77777b2b6954b0ef26a8c8317f9731fc9057f7630e WHIRLPOOL 803c89948ff7589dc045562922e9cbea37c3a81a1973fe16005b8ee1ce62b00f998f2a6a42d2aad751ae3f659839954ac69c5fc01533178aaa09010ad530460b
 DIST 3.12-sabayon-3.12.26.patch.xz 1031768 SHA256 f2411168f128f2069fe01c4be20a2401b55394f78e9c6f6bbd8ae58e6ce8b4de SHA512 f3e94c5f1c727c45e094169f3368a4fcbbc0a4579920a30aafd641f34b291443149906a3c1136ef36c0ff6e5574497b33cf2a9c166ac2f1b8b098a127223c0c2 WHIRLPOOL 8233407de42573ddca89bfbd8ef8ede9394916a7036f9c5a006a458a9dd3b1ca3703fe4dc6ae67898ef7e55e57447ddf7898de4c2c7be63bc5dfcabf752a2ec3
 DIST 3.12-sabayon-3.12.27.patch.xz 1061772 SHA256 2feea44d233a382f7a95c2ae198c884ef0cd0663764c286674bd5d1946b83a6a SHA512 f1a92e5a787a9326701948d1962d106402d57eed7994df95760e348078cd203d4c70f1d5a36356240e0537ea4b5e99512211fbf4655cf57b98f5f3c65c26cbe4 WHIRLPOOL 7ff7492c36cad0f181cfa881160fbe6c74e7883db3db013c70527f40060fb10026acdac5431e6325e700bd55939142aa2202b575becdf9004e21d79d1b211e12
 DIST 3.12-sabayon-3.12.28.patch.xz 1075160 SHA256 0650651dfedc625e29a902e1ed47cbafc55dd9276b35e719c584288ac79acd83 SHA512 8362fd22b450b86a43da6341f646d6426557691e4141b74d73f446f75789766b4d8ca3c5b4bd2adbf237616857bcc1220644376393d1d11693d7755708a574cb WHIRLPOOL ae7ef147967f030d1a40e1348b3a1b32350d132f3ceb8961bf29388c662a04d13e3950e10119c49c18e6f95a84c1a9d4e258fdb9fb1adacacc23d064c6ad548e
diff --git a/sys-kernel/linux-ec2/linux-ec2-3.10.58.ebuild b/sys-kernel/linux-ec2/linux-ec2-3.10.58.ebuild
new file mode 100644
index 000000000..c464e2b01
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-3.10.58.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="20140603"
+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 b13ba9bd6..e11d7a418 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -3,6 +3,7 @@ DIST 3.10-sabayon-3.10.54.patch.xz 1150020 SHA256 715d02e489bc42a4036c4461569a05
 DIST 3.10-sabayon-3.10.55.patch.xz 1171072 SHA256 18337bea6328f93980186982ea0780f3cad750dce70b9325c349b6a0dbfa3836 SHA512 90e10da15cea4d645bf55dccb105a5a882350fc9872b510310022e5bca94595bd89c7e35ec72a561ccb1d82865f0c844a16d78fd73abe547bec96fcc1ca79b8d WHIRLPOOL d08db0ef012bcf5495a3977a7cd9a9cf927a1512ae267a3bc2bc3f3bb274b55c937fac7308516dd8d12bb6daab7fa588cbc0361365de4ea8fb27bfc6936877fb
 DIST 3.10-sabayon-3.10.56.patch.xz 1196944 SHA256 93236c0b320129d5af563d08ae8e84daf196462d839e3d31c4b002362b2aef02 SHA512 7456902aae5ce316873ce93cee381f705b48ceac4892e330c07a565e9dcee6442e0863e9c3df265542a2ce5ab741e00e3cd92020ce1f11d9a20ccba9793b5934 WHIRLPOOL c4318d4af05bbb22fc545deae92e25160a6bdbb096ed9ab19d20775fdb012a4aadee68c9e9528a1aa6af7e04216018b8332502e9594d989107b0c7b5d4bd4951
 DIST 3.10-sabayon-3.10.57.patch.xz 1201696 SHA256 21ce3d8f6e4e8861c3ef99028425812ffc7f6c331e7cd3639c482c0f0e3c022d SHA512 2b1d2f6aa2db09d068a0550b8c2e760dc097dc4048d563c87333643120597bdd2b797bb276367743a5e283216219c03b89d08ed9372822198f3ceca122ea2192 WHIRLPOOL 61ae5689ca0da51ca3aa07ba849a86c2afa62b942c0695f38cdf7280aed98502ff52698a7a1d77b9833cceb657564b02d8d89d14ec30fa025f78312a1a536b0d
+DIST 3.10-sabayon-3.10.58.patch.xz 1205828 SHA256 c944b0ff7952aa53479b0a31509786ceb2a8d919dee1fcbd367c3e44dcdb669b SHA512 7e8b54ae8560183569b4968513694cd3b1197226aa21e4ff765746f4ae5150e2f321954ed3cb67f0cd239e77777b2b6954b0ef26a8c8317f9731fc9057f7630e WHIRLPOOL 803c89948ff7589dc045562922e9cbea37c3a81a1973fe16005b8ee1ce62b00f998f2a6a42d2aad751ae3f659839954ac69c5fc01533178aaa09010ad530460b
 DIST 3.12-sabayon-3.12.26.patch.xz 1031768 SHA256 f2411168f128f2069fe01c4be20a2401b55394f78e9c6f6bbd8ae58e6ce8b4de SHA512 f3e94c5f1c727c45e094169f3368a4fcbbc0a4579920a30aafd641f34b291443149906a3c1136ef36c0ff6e5574497b33cf2a9c166ac2f1b8b098a127223c0c2 WHIRLPOOL 8233407de42573ddca89bfbd8ef8ede9394916a7036f9c5a006a458a9dd3b1ca3703fe4dc6ae67898ef7e55e57447ddf7898de4c2c7be63bc5dfcabf752a2ec3
 DIST 3.12-sabayon-3.12.27.patch.xz 1061772 SHA256 2feea44d233a382f7a95c2ae198c884ef0cd0663764c286674bd5d1946b83a6a SHA512 f1a92e5a787a9326701948d1962d106402d57eed7994df95760e348078cd203d4c70f1d5a36356240e0537ea4b5e99512211fbf4655cf57b98f5f3c65c26cbe4 WHIRLPOOL 7ff7492c36cad0f181cfa881160fbe6c74e7883db3db013c70527f40060fb10026acdac5431e6325e700bd55939142aa2202b575becdf9004e21d79d1b211e12
 DIST 3.12-sabayon-3.12.28.patch.xz 1075160 SHA256 0650651dfedc625e29a902e1ed47cbafc55dd9276b35e719c584288ac79acd83 SHA512 8362fd22b450b86a43da6341f646d6426557691e4141b74d73f446f75789766b4d8ca3c5b4bd2adbf237616857bcc1220644376393d1d11693d7755708a574cb WHIRLPOOL ae7ef147967f030d1a40e1348b3a1b32350d132f3ceb8961bf29388c662a04d13e3950e10119c49c18e6f95a84c1a9d4e258fdb9fb1adacacc23d064c6ad548e
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.10.58.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.10.58.ebuild
new file mode 100644
index 000000000..e8702a9a9
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.10.58.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="20140603"
+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 b13ba9bd6..e11d7a418 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -3,6 +3,7 @@ DIST 3.10-sabayon-3.10.54.patch.xz 1150020 SHA256 715d02e489bc42a4036c4461569a05
 DIST 3.10-sabayon-3.10.55.patch.xz 1171072 SHA256 18337bea6328f93980186982ea0780f3cad750dce70b9325c349b6a0dbfa3836 SHA512 90e10da15cea4d645bf55dccb105a5a882350fc9872b510310022e5bca94595bd89c7e35ec72a561ccb1d82865f0c844a16d78fd73abe547bec96fcc1ca79b8d WHIRLPOOL d08db0ef012bcf5495a3977a7cd9a9cf927a1512ae267a3bc2bc3f3bb274b55c937fac7308516dd8d12bb6daab7fa588cbc0361365de4ea8fb27bfc6936877fb
 DIST 3.10-sabayon-3.10.56.patch.xz 1196944 SHA256 93236c0b320129d5af563d08ae8e84daf196462d839e3d31c4b002362b2aef02 SHA512 7456902aae5ce316873ce93cee381f705b48ceac4892e330c07a565e9dcee6442e0863e9c3df265542a2ce5ab741e00e3cd92020ce1f11d9a20ccba9793b5934 WHIRLPOOL c4318d4af05bbb22fc545deae92e25160a6bdbb096ed9ab19d20775fdb012a4aadee68c9e9528a1aa6af7e04216018b8332502e9594d989107b0c7b5d4bd4951
 DIST 3.10-sabayon-3.10.57.patch.xz 1201696 SHA256 21ce3d8f6e4e8861c3ef99028425812ffc7f6c331e7cd3639c482c0f0e3c022d SHA512 2b1d2f6aa2db09d068a0550b8c2e760dc097dc4048d563c87333643120597bdd2b797bb276367743a5e283216219c03b89d08ed9372822198f3ceca122ea2192 WHIRLPOOL 61ae5689ca0da51ca3aa07ba849a86c2afa62b942c0695f38cdf7280aed98502ff52698a7a1d77b9833cceb657564b02d8d89d14ec30fa025f78312a1a536b0d
+DIST 3.10-sabayon-3.10.58.patch.xz 1205828 SHA256 c944b0ff7952aa53479b0a31509786ceb2a8d919dee1fcbd367c3e44dcdb669b SHA512 7e8b54ae8560183569b4968513694cd3b1197226aa21e4ff765746f4ae5150e2f321954ed3cb67f0cd239e77777b2b6954b0ef26a8c8317f9731fc9057f7630e WHIRLPOOL 803c89948ff7589dc045562922e9cbea37c3a81a1973fe16005b8ee1ce62b00f998f2a6a42d2aad751ae3f659839954ac69c5fc01533178aaa09010ad530460b
 DIST 3.12-sabayon-3.12.26.patch.xz 1031768 SHA256 f2411168f128f2069fe01c4be20a2401b55394f78e9c6f6bbd8ae58e6ce8b4de SHA512 f3e94c5f1c727c45e094169f3368a4fcbbc0a4579920a30aafd641f34b291443149906a3c1136ef36c0ff6e5574497b33cf2a9c166ac2f1b8b098a127223c0c2 WHIRLPOOL 8233407de42573ddca89bfbd8ef8ede9394916a7036f9c5a006a458a9dd3b1ca3703fe4dc6ae67898ef7e55e57447ddf7898de4c2c7be63bc5dfcabf752a2ec3
 DIST 3.12-sabayon-3.12.27.patch.xz 1061772 SHA256 2feea44d233a382f7a95c2ae198c884ef0cd0663764c286674bd5d1946b83a6a SHA512 f1a92e5a787a9326701948d1962d106402d57eed7994df95760e348078cd203d4c70f1d5a36356240e0537ea4b5e99512211fbf4655cf57b98f5f3c65c26cbe4 WHIRLPOOL 7ff7492c36cad0f181cfa881160fbe6c74e7883db3db013c70527f40060fb10026acdac5431e6325e700bd55939142aa2202b575becdf9004e21d79d1b211e12
 DIST 3.12-sabayon-3.12.28.patch.xz 1075160 SHA256 0650651dfedc625e29a902e1ed47cbafc55dd9276b35e719c584288ac79acd83 SHA512 8362fd22b450b86a43da6341f646d6426557691e4141b74d73f446f75789766b4d8ca3c5b4bd2adbf237616857bcc1220644376393d1d11693d7755708a574cb WHIRLPOOL ae7ef147967f030d1a40e1348b3a1b32350d132f3ceb8961bf29388c662a04d13e3950e10119c49c18e6f95a84c1a9d4e258fdb9fb1adacacc23d064c6ad548e
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.10.58.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.10.58.ebuild
new file mode 100644
index 000000000..aa17b6fa6
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.10.58.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} )"