diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest
index 0a10d6f..15fd9b7 100644
--- a/sys-kernel/xanmod-sources/Manifest
+++ b/sys-kernel/xanmod-sources/Manifest
@@ -2,8 +2,7 @@ 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.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.11-xanmod1.xz 603812 BLAKE2B 46e50c060f818dfa1d2ce26cf7687dcd6d852ab4df732f080009ccb3dbec4b44286b3973720ab51137902ffbd097185af176c8005624cde551dab0c4be9f6519 SHA512 117bc4bbf5d363f17ec276b8d9a4103a0454dae7fdb24e9208324f096f8b628a3427895119d0f2f1a4345745aa6294ba9a4bff703bb9749fefd43878dc212df4
 DIST patch-5.8.6-xanmod1.xz 424240 BLAKE2B 4a203811163092f80d7588af73d3598f09092037a5df3c467734f4eb2de2e21b43c9883a52c860f609f8a65e6340f97269cc32f4ecb7c3e27cd4de7d6caac850 SHA512 fb1ace6702188ac3d773f6c5d450a7385e5dd65c0ae2215b6e7b30b742d4051326f3c87594194e5b474f0dee95b2f6f92df7012f627622c53395b7b788bbbd65
 DIST patch-5.8.8-xanmod1.xz 481372 BLAKE2B 07c223c3806d14223a307ae6336b268d413f8df2a5ca4d37b3ffa076bf3f3f965fd54cfb4eee20651a8e30b8f40dddeff8dc8ebc4a977f6fa33e99f103a4b0e0 SHA512 f18d4dc75c383564e048102d434c78c05146133d2a52681ee98ba2edcd700c17d3ab316e7551f2bea1bf1fd270a1de828b5e7d33b9a55877c88424ff4471273d
 DIST patch-5.8.9-xanmod1.xz 531936 BLAKE2B 54a0ed12e67c2451a1d75e1059083ecc31ed01915e8c9f10559b8fd0fbaa1f42aee68407a42094fde4b2bec2ae67f324118f64cebdf7f249f35ca756b7caae36 SHA512 1da64811c88a84edb3ec28e8e0f3ef8d9c14fe514d47ca3344c6d4b9bd7def190db317a0ed4f802f34b4ce830bc514edbbdce1e44f25fe9b8b0c03306fdeb229
diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.3.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.11.ebuild
similarity index 72%
rename from sys-kernel/xanmod-sources/xanmod-sources-5.8.3.ebuild
rename to sys-kernel/xanmod-sources/xanmod-sources-5.8.11.ebuild
index 945d327..c0df358 100644
--- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.3.ebuild
+++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.11.ebuild
@@ -2,17 +2,20 @@
 # 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="A general-purpose kernel with custom settings and new features"
+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"
+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"
diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.2.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.2.ebuild
deleted file mode 100644
index bde8615..0000000
--- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-XANMOD_VERSION="2"
-ETYPE="sources"
-inherit kernel-2-src-prepare-overlay
-detect_version
-
-DESCRIPTION="A general-purpose kernel with custom settings and new features"
-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"
-
-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
-
-}