diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 5aa8d0d..41e32f4 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,12 +1,9 @@
 DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
 DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
-DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e741a2bf9cfe569aadce43767b671706d256082a07e5c3b11bd9cc849bde645b664c641958590d1ec0b73dd826dab2996f56 SHA512 5dab9eb4f0077d5822b736e282696b95993e17d1078691cd14c2201043e9be9c496c56d5f89cfd38fbb5d0c1da433f62d35ff8b9542423524ef701205bc04577
-DIST genpatches-5.8-11.extras.tar.xz 1764 BLAKE2B 3798c0b54dd3056dfd389db8bbcea775462b218d9670c3322240d90d8f894c89bde55a04a80220e76b0d6fd135c32af1d9f5564795f30e9368f3f58d0d45501f SHA512 958d68e317c0140b2540f757dfabc767e28f1878a2b65012599248edd9ab8ac20e7f1736a0f802f01a9f0f22cc743f1a1f9f4665ac287ba6a477521dee323ab1
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST v5.8-zen1.patch.xz 48796 BLAKE2B b87018182422e68d637f89ef6d2a4695509d5bdda8a08ac8c6e18112a4eca86b1bce9141c961a9500feade8877732b3ed33960b888710d0f32d4d0af0c20c34c SHA512 3418c7f8b66fd1d48b50532286ec357c65d6f5d335709f10e79e87f6390bc253cc320a3aefd1fe554b4541e0ce4b49e6f95314b8ee9ffcf8bec43a06f43b09e9
 DIST v5.8.10-zen1.patch.xz 624720 BLAKE2B 37c8853799aecba279b1e68f9de732e7ed03fe2a064017cf47c9ca8e7ff5156e94fb8c4a9502007ce93c52d022a0de1f2ee96b4edd9a95520f06192dd88b8d4a SHA512 4ad6d4db4233896c29a5785be76280f0ca07cfc5db8c8b6519b74238d6cddec3cb7cdd3cf2d0ba3d440df2411a917b5a2ed0933e72ea81beab163d1cae3bd11d
 DIST v5.8.11-zen1.patch.xz 654112 BLAKE2B 154ce5e608d584e881948388c78ebc4a222c2b63ddf5ccf898eaffc361479280920a6270142694c279b7fbd170d35aad9dc09e8f92ccc465fecd92ced940cbb0 SHA512 5cf8507b1c35ab2049330124014508ce80d6a524dedaad12a95fc398f2c5e33ee23bab35a1a306ed58185921aed425f55c4b9059744bddb53fb8af71daef5d9a
 DIST v5.8.12-zen1.patch.xz 672060 BLAKE2B 86cf8d1cc9142b6519d89a2b9d12498658f1e20193c3a629e9c89b858e7d6fbbd0460cff97437f9d4a35c69b3d875505a9e184288302fbdfc289cac2a20cf165 SHA512 9de0173b456f23df3dbd0db0274ff1c2b383ecc1ab4043a6405d871e7a567b4292483ec768d15f424cc4d78aef93db5d2a5e602781538a767e06af3b32b34b12
 DIST v5.8.13-zen1.patch.xz 698624 BLAKE2B 7c91324015da999b12e097a1cbdbc1fc1919b3a97f1550652a9459334ed963d098c883ce841126d80374621e53a0403fd0e91ffd8410c0d9f73aef900e554c89 SHA512 9bd11bf06fc295f0518cafcf95570c123f3a3ad0aa57d2e654bbc82add78bdb6cc3a10669540de0a06b3a932d06c069e37ed177c978443629ee50d1c35a5e8b1
-DIST v5.8.8-zen1.patch.xz 568664 BLAKE2B a46ac53b10fb566b43e266a5afce1ebd8eb0ec9f05549db594fcbf94a21ca22af114b7abb6f9252fac447b3389d5f39849feb1adf6cb1736a8ed53302da439bc SHA512 b2f423d48d23741ce2be317cff17564e2e0dc0183aa738e8e49592cdbac90b6c690c74e3d0dac3aa2f7defc375f3465e4b8ae21ca026cec00b1585d6d152f859
+DIST v5.8.14-zen1.patch.xz 720476 BLAKE2B 54075951adf88c652c828cea27734baef479e76402677d8a2070b3cd33a7af1b32097c852ef9eb8951e73f2d21b4a6d7f03e368e8607aef651e1acfcccb4fe5c SHA512 e3b6b6874f44ed486a0bd0695052f76539eb848b267d05b0f384db77911f6ec277e2210b993d2b6fbc3a44978776096c6e72a9bd0167454cd1f69f5e211d1d27
 DIST v5.8.9-zen1.patch.xz 574576 BLAKE2B 3d68f784bd6b3af9abd2388f591a5e656c84178c4144a282abbee65002b8e61db73a153fa5d2c832ecbb5cfb3e7f82a5927cbcf85fc3abaf8ea877c8ef24ee64 SHA512 903f53ba4f8cd9b9856793601c229de48e204e607235d85bb62ec0682a689761d09e4a085d3ae5a28c40a3299ef78b45fee761d602a7257b9b54da082d564b4d
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.8-r3.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.14.ebuild
similarity index 85%
rename from sys-kernel/zen-sources/zen-sources-5.8.8-r3.ebuild
rename to sys-kernel/zen-sources/zen-sources-5.8.14.ebuild
index 843c53c..5772bfb 100644
--- a/sys-kernel/zen-sources/zen-sources-5.8.8-r3.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.8.14.ebuild
@@ -7,7 +7,7 @@ K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="1"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
-
+ZEN_VERSION="1"
 inherit kernel-2-src-prepare-overlay
 detect_version
 detect_arch
@@ -18,10 +18,10 @@ IUSE=""
 
 DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen${ZEN_VERSION}/v${PV}-zen${ZEN_VERSION}.patch.xz"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen${ZEN_VERSION}.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
 K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.8-r1.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.8-r1.ebuild
deleted file mode 100644
index c3dce43..0000000
--- a/sys-kernel/zen-sources/zen-sources-5.8.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on freenode"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.8-r2.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.8-r2.ebuild
deleted file mode 100644
index ab1f75b..0000000
--- a/sys-kernel/zen-sources/zen-sources-5.8.8-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2-src-prepare-overlay
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on freenode"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.8.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.8.ebuild
deleted file mode 100644
index 553685a..0000000
--- a/sys-kernel/zen-sources/zen-sources-5.8.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2-src-prepare-overlay
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v5.8-zen1/v5.8-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v5.8-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"