diff --git a/sys-kernel/liquorix-sources/Manifest b/sys-kernel/liquorix-sources/Manifest
index a96f9bc..3795667 100644
--- a/sys-kernel/liquorix-sources/Manifest
+++ b/sys-kernel/liquorix-sources/Manifest
@@ -4,10 +4,8 @@ DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad
DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST v5.7.12-lqx1.patch.xz 678728 BLAKE2B 733be1ce8a2eba4bc935a199f22cc57135d1e60ef24b70fa1a1dab7f03eeb4b2adcf7486fc4cf9058c32a466b9b26ec61122cfe5e0343e2e0107aa65c26fdcf2 SHA512 c7c0477a5ab7e0d2a26cdc52b3e934d8e501e685ef7f89dfb85a90d285d30cc85533f739774123c7c8256131bd68fd248daedd19b70aa73808a571af2dc86553
-DIST v5.7.17-lqx1.patch.xz 860196 BLAKE2B 283d9d2398c1c48c39e25739f86618b67b17226fc764ffc6c72e213e52dddc937a9a15e50aa2aee5e322a490a550904fdb1777593119652a998ad96214038aac SHA512 cdb768991dabb9361ba3622a7ece917fc4ea6e1f6c2289980b0074f695f0c78209bdb4eb6cad5d3570d54e45665713653d4d2d2049ff0bd0564b1ff17f6b0813
-DIST v5.7.18-lqx1.patch.xz 884812 BLAKE2B 1d27891bdbbb287373bd3ddea36290ac3a3281f4bfb26b4392347eb8b9144ea37bf25ebe219bf95e39823e78bdbaafdb8d126badf1a71136ee406af902e3b221 SHA512 e128cbfe3d335d017d9ce0c1b635e3bcd7d3d9e1c9f92221b3c706c0684ec4498aa3e93623e89b0f86c109ca24d4152f4569d7d60f097741b9b0965ea77020c5
DIST v5.7.19-lqx1.patch.xz 887324 BLAKE2B a2ecbf85718002c6474de28794117fd9cecbeaa0ce3604eb8e12967e3fe8c72766bcb5dab02b1c06358d0dae0d3b0ec97a543bd5df25676452f1179db18f1843 SHA512 01c4d959b896b48c8c1b31e405c104e2d39b5dcbff3ad45b69ad8868edb3482b9b9b14a7a27dab8d98f05863ddd7440e22f5720b76f0e87ca0c56f76715df34a
+DIST v5.8.10-lqx1.patch.xz 565844 BLAKE2B a76cf664b9dc92a9bf4d13e006e07928c23d917070877dfe0ae6046dee101b4282057dac947eda57a89ea15f280c426dc381a03506663c091a16c1f2f5171c96 SHA512 5f28a327cf03dd7585f29a099bddc42d60b4546b5f58c1a20ef6812d2c4228140b2af27e8a8e99821553e169c585b18ab8ee88b93ea1173f55edf9975687f795
DIST v5.8.6-lqx1.patch.xz 458048 BLAKE2B f1148284fafd9d34b36e929f53e7f014d3001dc75aab7f2baf7b49dcf6551f48ff50ec60f09f1d602b3af0309ec230fc1fa2fc5d183298af194be0269a8c25e4 SHA512 1790e5b12cb2840d25ae9a3e8a0d259941cb13a3f491fcaafaed149ba899667220da5c18414a41f353807f2c9666fd721b9403584cfbc493640abde9b0218199
DIST v5.8.7-lqx1.patch.xz 465048 BLAKE2B 71dec82cc1d4a9be914d934c3a4deaacb208b874534e60beea3ec8586d25c1d55a5a29cc48c8a54acfa3a56cd23ad7f02dc6cb23cc18694453a2158bd8daa6d2 SHA512 c9da6480fa1ef4ca6bb5cf1ef56e748b60c56e4b24662906ed01e74ada4d888872c4b1616ebb31ec8543f0ed7ce0d8c658f073b0a6f1a9f4ac1ef37a38ee0e05
DIST v5.8.8-lqx1.patch.xz 515048 BLAKE2B 57de4e07fe051ee89cbbff18c6b7cbbd3441bcfc021b28f2641593c2b49725f6eb24966b9b9eb5df490f1df8b9012bd3eef57058d0fb995792748a6f9fe48eb8 SHA512 dcc59a14bb6a82c69847becd821381bcc664f74b474ae314d2cfc9dd314f843d09ee5c85c65c17b55d0c96eab27681c1afdcfcf1c1d4f2c62dc6d8d1b2fb2aa7
diff --git a/sys-kernel/liquorix-sources/liquorix-sources-5.7.17.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.7.17.ebuild
deleted file mode 100644
index 421f8ee..0000000
--- a/sys-kernel/liquorix-sources/liquorix-sources-5.7.17.ebuild
+++ /dev/null
@@ -1,24 +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="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/liquorix-sources/liquorix-sources-5.7.18.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.7.18.ebuild
deleted file mode 100644
index 421f8ee..0000000
--- a/sys-kernel/liquorix-sources/liquorix-sources-5.7.18.ebuild
+++ /dev/null
@@ -1,24 +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="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/liquorix-sources/liquorix-sources-5.7.12.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.8.10.ebuild
similarity index 55%
rename from sys-kernel/liquorix-sources/liquorix-sources-5.7.12.ebuild
rename to sys-kernel/liquorix-sources/liquorix-sources-5.8.10.ebuild
index 421f8ee..d10676f 100644
--- a/sys-kernel/liquorix-sources/liquorix-sources-5.7.12.ebuild
+++ b/sys-kernel/liquorix-sources/liquorix-sources-5.8.10.ebuild
@@ -7,6 +7,7 @@ K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
+LQX_VERSION="1"
inherit kernel-2-src-prepare-overlay
detect_version
@@ -17,8 +18,16 @@ HOMEPAGE="https://github.com/zen-kernel"
IUSE=""
DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
-UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
+LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx${LQX_VERSION}/v${PV}-lqx${LQX_VERSION}.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx${LQX_VERSION}.patch.xz"
UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on liquorix-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/liquorix-sources/metadata.xml b/sys-kernel/liquorix-sources/metadata.xml
index a6fb995..bb63274 100644
--- a/sys-kernel/liquorix-sources/metadata.xml
+++ b/sys-kernel/liquorix-sources/metadata.xml
@@ -1,7 +1,15 @@
-
- zen-kernel/zen-kernel
-
-
+
+ themainone@mailu.io
+ TheMainOne
+
+
+ hedmoo@yahoo.com
+ Andreas Westman Dorcsak
+
+
+ zen-kernel/zen-kernel
+
+
diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest
index 926e966..0a10d6f 100644
--- a/sys-kernel/xanmod-sources/Manifest
+++ b/sys-kernel/xanmod-sources/Manifest
@@ -1,6 +1,7 @@
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 linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST patch-5.8.10-xanmod1.xz 577460 BLAKE2B 0782e38abc3d398b559f6797b7da169a97faadaddc326d6d2245786e335368fc5ffccffbbde4ec17a344daaeb4df0afb856b177d0e12e2ae959c2a496c8e8d7f SHA512 e76ef6231d00d97a7d026c0931f489f2096c9c748cddbc30ca68d49ca58eec69eec91c703a6109bb15508ff29513d389ccf286b3261d2cebf70a82b35a3cd881
DIST patch-5.8.2-xanmod2.xz 243308 BLAKE2B 83bf4b1032bc34a9a0c207d3430b9adf8192dfed09fec7e0c4bd2a4b562b5902b3d8675074d81fbe7e5fb83cceb4543537b55061555bccf971d77d9b9b0777ff SHA512 f79ade1fda3082df4294711d366388b10a88f5236c188a3101cb502667c3e16d2ec204705c650b98a2474ab6f621ce99a9a2317d161959316c5baab9a9e88263
DIST patch-5.8.3-xanmod1.xz 306424 BLAKE2B f2cc9c6c41c4b38faca91d890517f56227d443e4395c3ff4376003a6c73fdb2df188c0529557b35915eeedd9299840c7699ddbaddfa8ef1e01ed8118b7e78bee SHA512 74648df38d547e82c99969cf820b91043000b02f7747207dca1fc37b0cc12ed24e72c0560740640ea5af441e752633922fcf063707f0bb5203fe753a94e623b1
DIST patch-5.8.6-xanmod1.xz 424240 BLAKE2B 4a203811163092f80d7588af73d3598f09092037a5df3c467734f4eb2de2e21b43c9883a52c860f609f8a65e6340f97269cc32f4ecb7c3e27cd4de7d6caac850 SHA512 fb1ace6702188ac3d773f6c5d450a7385e5dd65c0ae2215b6e7b30b742d4051326f3c87594194e5b474f0dee95b2f6f92df7012f627622c53395b7b788bbbd65
diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.10.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.10.ebuild
new file mode 100644
index 0000000..c0df358
--- /dev/null
+++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+XANMOD_VERSION="1"
+ETYPE="sources"
+
+inherit kernel-2-src-prepare-overlay
+detect_version
+
+DESCRIPTION="Full XanMod sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://xanmod.org"
+LICENSE+=" CDDL"
+SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz ${GENPATCHES_URI}"
+
+UNIPATCH_LIST_DEFAULT=""
+UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz"
+
+KEYWORDS="~amd64"
+
+src_prepare() {
+
+ kernel-2-src-prepare-overlay_src_prepare
+
+ rm "${S}"/.config || die
+
+}
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index c7b426c..de0ab65 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -4,7 +4,7 @@ DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e7
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.1-zen1.patch.xz 61564 BLAKE2B c6db8b5605e45a5bb80f28ec505440db2e5dd7ef5f6a9272d879043c8bb71c49461cd033cac5b8cc588a79a99c85333c6a541978dcb5f02a08b32b4eb467674c SHA512 c7afb6ca90d14d657784c7a5802e8393024921fec26ecda90a735e40dbecda4294847160ee215bf1d0ae61b8e25bc8aa130aaaabaffe4904f3590587f863fcf1
+DIST v5.8.10-zen1.patch.xz 624720 BLAKE2B 37c8853799aecba279b1e68f9de732e7ed03fe2a064017cf47c9ca8e7ff5156e94fb8c4a9502007ce93c52d022a0de1f2ee96b4edd9a95520f06192dd88b8d4a SHA512 4ad6d4db4233896c29a5785be76280f0ca07cfc5db8c8b6519b74238d6cddec3cb7cdd3cf2d0ba3d440df2411a917b5a2ed0933e72ea81beab163d1cae3bd11d
DIST v5.8.3-zen1.patch.xz 275184 BLAKE2B 60dc1d3fca0e6a3984a77eef4113bb8bff58df659b6e90eaf2dec00f950336b4e20974a83f1dd183c11341b5aded567b4adcd3d20d2eaedd6ad63d06bf211f2d SHA512 a8b8a280572fdd67ddcfca0dbb2a6bb257f82fb4a95e885c8981038012e9bb1753a63dfe51ab590e0b2e5501930e7f652147e0167dec01b0a74c151f042ba1a4
DIST v5.8.4-zen1.patch.xz 312916 BLAKE2B 479332057fe5b5f9bd2793528aeb771dc4cb5159b47be6cf2543ea0166e15fa745798cd707d364a1b79d14a481874995c9d0d5565527a1ce6781496559df13b6 SHA512 f8d75d8ecb343636bf4f926ffc3b086df7b682f117b65fecf867ef30d11228361de094002a49aee90caf4de503bcd87a9d2e7ca93adbbfbb654381b226d48cb6
DIST v5.8.5-zen1.patch.xz 316392 BLAKE2B f3146efd89c187f0e103346a809ac7907c70e9a66d5c179e7c898c9b1e3ad7447668519e7625575858ea1d4e6b084a66dad2e5fc98432892d0accbe7c2008a14 SHA512 3a452042a82bd56defb6d5f048ff70986a720f1190a16a91ab101d5b7394f85b0e3a57f791c439f5a9825346537628ccec61782fc0f8b69338e70315d3cd681b
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index e268374..bb63274 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -1,7 +1,15 @@
-
- zen-kernel/zen-kernel
-
-
\ No newline at end of file
+
+ themainone@mailu.io
+ TheMainOne
+
+
+ hedmoo@yahoo.com
+ Andreas Westman Dorcsak
+
+
+ zen-kernel/zen-kernel
+
+
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.1.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.10.ebuild
similarity index 81%
rename from sys-kernel/zen-sources/zen-sources-5.8.1.ebuild
rename to sys-kernel/zen-sources/zen-sources-5.8.10.ebuild
index bf1b227..843c53c 100644
--- a/sys-kernel/zen-sources/zen-sources-5.8.1.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.8.10.ebuild
@@ -23,3 +23,10 @@ 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_postrm() {
+ kernel-2_pkg_postrm
+}