diff --git a/sys-kernel/ec2-sources/Manifest b/sys-kernel/ec2-sources/Manifest
index 6236397ba..10378c1eb 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -9,6 +9,7 @@ DIST 3.12-sabayon-3.12.17.patch.xz 770292 SHA256 d991991a093a03dd6f9c4f2331035e8
 DIST 3.12-sabayon-3.12.18.patch.xz 790424 SHA256 7728e00ee694e6ece2719e93efbb020530dfa29ae1cc2fb7f0202904e1c3db71 SHA512 69b92860d4ddcee90d44e4472fe5cf19ae3e85b9b1224d4f330fa79135b671fa37b374555336665572af83eac39d8fe24909caa20756e3c6a80154e23ae6c70b WHIRLPOOL d7efd40dd8b3036fd66c35eda91c0ed57e7e7f3265ca091d3d94470d3fed8c8c876191000a8ef4b6dd03180f3583866e1f48c80a43130084255ca33d1282f295
 DIST 3.12-sabayon-3.12.19.patch.xz 802608 SHA256 460520e160195334def9349f5a772b303c5fb4347682cc1d55c8a962b73ea938 SHA512 208d8a4e112b24ddce4df30b58ffe5cf72a15a24c998eb42b9f726698ac43c634941b7e75055637be38a6e2565a40eb165b4935cc83ac1d2c348ddc1ae8f361a WHIRLPOOL a77213523dcd1fea7f7ef13bee87d6144a50e8c57779e1faaf8ba66834c6e63b244086f567df889b400fe5f17452bda428775d1ec6a3cb1cc85179e79c6d10b9
 DIST 3.12-sabayon-3.12.20.patch.xz 846136 SHA256 9b45326914df8f7f028f12c0ca97bcfbfcc9af784dc3d07cf59a77756d629700 SHA512 bb3a537c64904b53468cdb314748081ab1633c215fd001149b0a4356a45d1b819f5efb6245ce4793b0c10df9fc424f1f3602258525d79e4b85f9d44119ce2c5e WHIRLPOOL 129425ab532753b4a5f6516d8e5835233afdf03c8796c064849d5df2e9b25e822270d03608f5a0353ebe6e9032edc681da0c65eefc3c4577da3df2b6c74b45fe
+DIST 3.12-sabayon-3.12.21.patch.xz 871076 SHA256 c7e4ecaa780891f2ffeaf0a71ca5e3a36f1b6ddfad5225400436dc566572ccd4 SHA512 2f0c94639c95da18fff0b980ee2457df9ecaf12d24a7f385be2d6a4032b6b5582ff1184ae26253625e65520814cc67c2453bc20d2839bbc748d5fb30d8588bf7 WHIRLPOOL d7c6c4b6cfd7abc24dd03aac3d16adbb42e42c8e92766c861489f17bc54805b3f2bbf6c36b59ac90e2d7c669a6a77446f6105159404e6165dd46c9895e6a3d0c
 DIST 3.12-sabayon-3.12.9.patch.xz 569952 SHA256 3917718e3271d15e7396c0419cd02ab4c426d571b1576136383714a2a7c21e57 SHA512 d9a5a5a8992122b5c9a1cd4e640412b00dd9f923ec7260935772c70851f737e574833426121d5c090127e80e4d2daeb04b7f419dc13d8ff585d7b850e93058e0 WHIRLPOOL 4646be7e5f505da19b99866828f678a73c0591d1f00958effb51cb0d274f9c5582dcad6e87ed61cbd6ef9b3ffedd16036b0b89232190026d1a152b98001c7dff
 DIST 3.13-sabayon-3.13.10.patch.xz 581320 SHA256 968649a2ff31676cfe634468dbd15237dc782b9a4aa1f1f07a890e00e7dcfd13 SHA512 e16c458c57a9bf627026b01a46bbe9215f9b6b2c99fce13cd9330afe5af4d0dec056cce51b612f0c4de7eea181f87bb29e2229e513bf06cdf02c0fa17a90148c WHIRLPOOL d1a4c47cb4c39c0d5bf7095c3d345d39ba3bee1cc00bc8bfadc95d03abf8506c33e867ba0159f34f350cd33e336eec500ea1871c68bbdf136bc3dc81aac64a99
 DIST 3.13-sabayon-3.13.11.patch.xz 589204 SHA256 63b793ecafe62dfbd638492547b93f058b21da5c0138bd0e7e3d44af6bcd751a SHA512 d1b4aa84661a37c081de6b2adc51a6cb3749bd883f66069ebf0e659baa864499ee390c5d8ad8dc72678f3ef84f52aaa48c5158b4ecfdddc422f4c48aae60f404 WHIRLPOOL 13f8256527c46973a03abce96e6f33bdedf9ee52d21a4546a1399a259633275da1a2ae024216b2b1c1fa067397a4934a37e42a1457267ccb81176eefc3d2885a
diff --git a/sys-kernel/ec2-sources/ec2-sources-3.12.21.ebuild b/sys-kernel/ec2-sources/ec2-sources-3.12.21.ebuild
new file mode 100644
index 000000000..b1a545b89
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-3.12.21.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 ~x86"
+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 6236397ba..10378c1eb 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -9,6 +9,7 @@ DIST 3.12-sabayon-3.12.17.patch.xz 770292 SHA256 d991991a093a03dd6f9c4f2331035e8
 DIST 3.12-sabayon-3.12.18.patch.xz 790424 SHA256 7728e00ee694e6ece2719e93efbb020530dfa29ae1cc2fb7f0202904e1c3db71 SHA512 69b92860d4ddcee90d44e4472fe5cf19ae3e85b9b1224d4f330fa79135b671fa37b374555336665572af83eac39d8fe24909caa20756e3c6a80154e23ae6c70b WHIRLPOOL d7efd40dd8b3036fd66c35eda91c0ed57e7e7f3265ca091d3d94470d3fed8c8c876191000a8ef4b6dd03180f3583866e1f48c80a43130084255ca33d1282f295
 DIST 3.12-sabayon-3.12.19.patch.xz 802608 SHA256 460520e160195334def9349f5a772b303c5fb4347682cc1d55c8a962b73ea938 SHA512 208d8a4e112b24ddce4df30b58ffe5cf72a15a24c998eb42b9f726698ac43c634941b7e75055637be38a6e2565a40eb165b4935cc83ac1d2c348ddc1ae8f361a WHIRLPOOL a77213523dcd1fea7f7ef13bee87d6144a50e8c57779e1faaf8ba66834c6e63b244086f567df889b400fe5f17452bda428775d1ec6a3cb1cc85179e79c6d10b9
 DIST 3.12-sabayon-3.12.20.patch.xz 846136 SHA256 9b45326914df8f7f028f12c0ca97bcfbfcc9af784dc3d07cf59a77756d629700 SHA512 bb3a537c64904b53468cdb314748081ab1633c215fd001149b0a4356a45d1b819f5efb6245ce4793b0c10df9fc424f1f3602258525d79e4b85f9d44119ce2c5e WHIRLPOOL 129425ab532753b4a5f6516d8e5835233afdf03c8796c064849d5df2e9b25e822270d03608f5a0353ebe6e9032edc681da0c65eefc3c4577da3df2b6c74b45fe
+DIST 3.12-sabayon-3.12.21.patch.xz 871076 SHA256 c7e4ecaa780891f2ffeaf0a71ca5e3a36f1b6ddfad5225400436dc566572ccd4 SHA512 2f0c94639c95da18fff0b980ee2457df9ecaf12d24a7f385be2d6a4032b6b5582ff1184ae26253625e65520814cc67c2453bc20d2839bbc748d5fb30d8588bf7 WHIRLPOOL d7c6c4b6cfd7abc24dd03aac3d16adbb42e42c8e92766c861489f17bc54805b3f2bbf6c36b59ac90e2d7c669a6a77446f6105159404e6165dd46c9895e6a3d0c
 DIST 3.12-sabayon-3.12.9.patch.xz 569952 SHA256 3917718e3271d15e7396c0419cd02ab4c426d571b1576136383714a2a7c21e57 SHA512 d9a5a5a8992122b5c9a1cd4e640412b00dd9f923ec7260935772c70851f737e574833426121d5c090127e80e4d2daeb04b7f419dc13d8ff585d7b850e93058e0 WHIRLPOOL 4646be7e5f505da19b99866828f678a73c0591d1f00958effb51cb0d274f9c5582dcad6e87ed61cbd6ef9b3ffedd16036b0b89232190026d1a152b98001c7dff
 DIST 3.13-sabayon-3.13.10.patch.xz 581320 SHA256 968649a2ff31676cfe634468dbd15237dc782b9a4aa1f1f07a890e00e7dcfd13 SHA512 e16c458c57a9bf627026b01a46bbe9215f9b6b2c99fce13cd9330afe5af4d0dec056cce51b612f0c4de7eea181f87bb29e2229e513bf06cdf02c0fa17a90148c WHIRLPOOL d1a4c47cb4c39c0d5bf7095c3d345d39ba3bee1cc00bc8bfadc95d03abf8506c33e867ba0159f34f350cd33e336eec500ea1871c68bbdf136bc3dc81aac64a99
 DIST 3.13-sabayon-3.13.11.patch.xz 589204 SHA256 63b793ecafe62dfbd638492547b93f058b21da5c0138bd0e7e3d44af6bcd751a SHA512 d1b4aa84661a37c081de6b2adc51a6cb3749bd883f66069ebf0e659baa864499ee390c5d8ad8dc72678f3ef84f52aaa48c5158b4ecfdddc422f4c48aae60f404 WHIRLPOOL 13f8256527c46973a03abce96e6f33bdedf9ee52d21a4546a1399a259633275da1a2ae024216b2b1c1fa067397a4934a37e42a1457267ccb81176eefc3d2885a
diff --git a/sys-kernel/linux-ec2/linux-ec2-3.12.21.ebuild b/sys-kernel/linux-ec2/linux-ec2-3.12.21.ebuild
new file mode 100644
index 000000000..102789e96
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-3.12.21.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="20131230"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_KERNEL_NEW_VERSIONING="1"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+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 6236397ba..10378c1eb 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -9,6 +9,7 @@ DIST 3.12-sabayon-3.12.17.patch.xz 770292 SHA256 d991991a093a03dd6f9c4f2331035e8
 DIST 3.12-sabayon-3.12.18.patch.xz 790424 SHA256 7728e00ee694e6ece2719e93efbb020530dfa29ae1cc2fb7f0202904e1c3db71 SHA512 69b92860d4ddcee90d44e4472fe5cf19ae3e85b9b1224d4f330fa79135b671fa37b374555336665572af83eac39d8fe24909caa20756e3c6a80154e23ae6c70b WHIRLPOOL d7efd40dd8b3036fd66c35eda91c0ed57e7e7f3265ca091d3d94470d3fed8c8c876191000a8ef4b6dd03180f3583866e1f48c80a43130084255ca33d1282f295
 DIST 3.12-sabayon-3.12.19.patch.xz 802608 SHA256 460520e160195334def9349f5a772b303c5fb4347682cc1d55c8a962b73ea938 SHA512 208d8a4e112b24ddce4df30b58ffe5cf72a15a24c998eb42b9f726698ac43c634941b7e75055637be38a6e2565a40eb165b4935cc83ac1d2c348ddc1ae8f361a WHIRLPOOL a77213523dcd1fea7f7ef13bee87d6144a50e8c57779e1faaf8ba66834c6e63b244086f567df889b400fe5f17452bda428775d1ec6a3cb1cc85179e79c6d10b9
 DIST 3.12-sabayon-3.12.20.patch.xz 846136 SHA256 9b45326914df8f7f028f12c0ca97bcfbfcc9af784dc3d07cf59a77756d629700 SHA512 bb3a537c64904b53468cdb314748081ab1633c215fd001149b0a4356a45d1b819f5efb6245ce4793b0c10df9fc424f1f3602258525d79e4b85f9d44119ce2c5e WHIRLPOOL 129425ab532753b4a5f6516d8e5835233afdf03c8796c064849d5df2e9b25e822270d03608f5a0353ebe6e9032edc681da0c65eefc3c4577da3df2b6c74b45fe
+DIST 3.12-sabayon-3.12.21.patch.xz 871076 SHA256 c7e4ecaa780891f2ffeaf0a71ca5e3a36f1b6ddfad5225400436dc566572ccd4 SHA512 2f0c94639c95da18fff0b980ee2457df9ecaf12d24a7f385be2d6a4032b6b5582ff1184ae26253625e65520814cc67c2453bc20d2839bbc748d5fb30d8588bf7 WHIRLPOOL d7c6c4b6cfd7abc24dd03aac3d16adbb42e42c8e92766c861489f17bc54805b3f2bbf6c36b59ac90e2d7c669a6a77446f6105159404e6165dd46c9895e6a3d0c
 DIST 3.12-sabayon-3.12.9.patch.xz 569952 SHA256 3917718e3271d15e7396c0419cd02ab4c426d571b1576136383714a2a7c21e57 SHA512 d9a5a5a8992122b5c9a1cd4e640412b00dd9f923ec7260935772c70851f737e574833426121d5c090127e80e4d2daeb04b7f419dc13d8ff585d7b850e93058e0 WHIRLPOOL 4646be7e5f505da19b99866828f678a73c0591d1f00958effb51cb0d274f9c5582dcad6e87ed61cbd6ef9b3ffedd16036b0b89232190026d1a152b98001c7dff
 DIST 3.13-sabayon-3.13.10.patch.xz 581320 SHA256 968649a2ff31676cfe634468dbd15237dc782b9a4aa1f1f07a890e00e7dcfd13 SHA512 e16c458c57a9bf627026b01a46bbe9215f9b6b2c99fce13cd9330afe5af4d0dec056cce51b612f0c4de7eea181f87bb29e2229e513bf06cdf02c0fa17a90148c WHIRLPOOL d1a4c47cb4c39c0d5bf7095c3d345d39ba3bee1cc00bc8bfadc95d03abf8506c33e867ba0159f34f350cd33e336eec500ea1871c68bbdf136bc3dc81aac64a99
 DIST 3.13-sabayon-3.13.11.patch.xz 589204 SHA256 63b793ecafe62dfbd638492547b93f058b21da5c0138bd0e7e3d44af6bcd751a SHA512 d1b4aa84661a37c081de6b2adc51a6cb3749bd883f66069ebf0e659baa864499ee390c5d8ad8dc72678f3ef84f52aaa48c5158b4ecfdddc422f4c48aae60f404 WHIRLPOOL 13f8256527c46973a03abce96e6f33bdedf9ee52d21a4546a1399a259633275da1a2ae024216b2b1c1fa067397a4934a37e42a1457267ccb81176eefc3d2885a
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.12.21.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.12.21.ebuild
new file mode 100644
index 000000000..e38326653
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.12.21.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="20131230"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_PATCH_UPSTREAM_TARBALL="1"
+K_KERNEL_NEW_VERSIONING="1"
+
+inherit sabayon-kernel
+
+KEYWORDS="~amd64 ~x86"
+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 6236397ba..10378c1eb 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -9,6 +9,7 @@ DIST 3.12-sabayon-3.12.17.patch.xz 770292 SHA256 d991991a093a03dd6f9c4f2331035e8
 DIST 3.12-sabayon-3.12.18.patch.xz 790424 SHA256 7728e00ee694e6ece2719e93efbb020530dfa29ae1cc2fb7f0202904e1c3db71 SHA512 69b92860d4ddcee90d44e4472fe5cf19ae3e85b9b1224d4f330fa79135b671fa37b374555336665572af83eac39d8fe24909caa20756e3c6a80154e23ae6c70b WHIRLPOOL d7efd40dd8b3036fd66c35eda91c0ed57e7e7f3265ca091d3d94470d3fed8c8c876191000a8ef4b6dd03180f3583866e1f48c80a43130084255ca33d1282f295
 DIST 3.12-sabayon-3.12.19.patch.xz 802608 SHA256 460520e160195334def9349f5a772b303c5fb4347682cc1d55c8a962b73ea938 SHA512 208d8a4e112b24ddce4df30b58ffe5cf72a15a24c998eb42b9f726698ac43c634941b7e75055637be38a6e2565a40eb165b4935cc83ac1d2c348ddc1ae8f361a WHIRLPOOL a77213523dcd1fea7f7ef13bee87d6144a50e8c57779e1faaf8ba66834c6e63b244086f567df889b400fe5f17452bda428775d1ec6a3cb1cc85179e79c6d10b9
 DIST 3.12-sabayon-3.12.20.patch.xz 846136 SHA256 9b45326914df8f7f028f12c0ca97bcfbfcc9af784dc3d07cf59a77756d629700 SHA512 bb3a537c64904b53468cdb314748081ab1633c215fd001149b0a4356a45d1b819f5efb6245ce4793b0c10df9fc424f1f3602258525d79e4b85f9d44119ce2c5e WHIRLPOOL 129425ab532753b4a5f6516d8e5835233afdf03c8796c064849d5df2e9b25e822270d03608f5a0353ebe6e9032edc681da0c65eefc3c4577da3df2b6c74b45fe
+DIST 3.12-sabayon-3.12.21.patch.xz 871076 SHA256 c7e4ecaa780891f2ffeaf0a71ca5e3a36f1b6ddfad5225400436dc566572ccd4 SHA512 2f0c94639c95da18fff0b980ee2457df9ecaf12d24a7f385be2d6a4032b6b5582ff1184ae26253625e65520814cc67c2453bc20d2839bbc748d5fb30d8588bf7 WHIRLPOOL d7c6c4b6cfd7abc24dd03aac3d16adbb42e42c8e92766c861489f17bc54805b3f2bbf6c36b59ac90e2d7c669a6a77446f6105159404e6165dd46c9895e6a3d0c
 DIST 3.12-sabayon-3.12.9.patch.xz 569952 SHA256 3917718e3271d15e7396c0419cd02ab4c426d571b1576136383714a2a7c21e57 SHA512 d9a5a5a8992122b5c9a1cd4e640412b00dd9f923ec7260935772c70851f737e574833426121d5c090127e80e4d2daeb04b7f419dc13d8ff585d7b850e93058e0 WHIRLPOOL 4646be7e5f505da19b99866828f678a73c0591d1f00958effb51cb0d274f9c5582dcad6e87ed61cbd6ef9b3ffedd16036b0b89232190026d1a152b98001c7dff
 DIST 3.13-sabayon-3.13.10.patch.xz 581320 SHA256 968649a2ff31676cfe634468dbd15237dc782b9a4aa1f1f07a890e00e7dcfd13 SHA512 e16c458c57a9bf627026b01a46bbe9215f9b6b2c99fce13cd9330afe5af4d0dec056cce51b612f0c4de7eea181f87bb29e2229e513bf06cdf02c0fa17a90148c WHIRLPOOL d1a4c47cb4c39c0d5bf7095c3d345d39ba3bee1cc00bc8bfadc95d03abf8506c33e867ba0159f34f350cd33e336eec500ea1871c68bbdf136bc3dc81aac64a99
 DIST 3.13-sabayon-3.13.11.patch.xz 589204 SHA256 63b793ecafe62dfbd638492547b93f058b21da5c0138bd0e7e3d44af6bcd751a SHA512 d1b4aa84661a37c081de6b2adc51a6cb3749bd883f66069ebf0e659baa864499ee390c5d8ad8dc72678f3ef84f52aaa48c5158b4ecfdddc422f4c48aae60f404 WHIRLPOOL 13f8256527c46973a03abce96e6f33bdedf9ee52d21a4546a1399a259633275da1a2ae024216b2b1c1fa067397a4934a37e42a1457267ccb81176eefc3d2885a
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.12.21.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.12.21.ebuild
new file mode 100644
index 000000000..a0074b088
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.12.21.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 ~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} )"