diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index b9b3275..91f9990 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -1,10 +1,9 @@
 DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
 DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
-DIST genpatches-5.17-7.base.tar.xz 557368 BLAKE2B 7d9668f583167cb46a87a451416a69e1f1042bff745cca1394e83649580f920fd18aa030f558975f9ac4e256f70336ffd3b238616fd58697f9370753d7753d22 SHA512 3164fe7a6907bc7ceaf48dbc474c8d3807aa7499cb2a706995d3c27da89a19b34990d9b981d5d0e583ce23973a9a4dd2ad251d44c1f8d539dfd6e64d93416d28
-DIST genpatches-5.17-7.extras.tar.xz 3796 BLAKE2B 6921f442b3c5a3d1f5d437504668488c96879cfcbbfc096275afccab4664d01a0748b0a72e4bbcc1f1564829eeb8346402a14120d79a7be923cf08c0ecacf385 SHA512 8049dfa5390180a9d0cad7d18ea13cf2620e9883d733d8d5e2a09c11b26e4afd8ae28f81872e7e16bd6107205f0bf17edb475b390384fb4989d688b7b49630ae
+DIST genpatches-5.17-12.base.tar.xz 685640 BLAKE2B 3a662f399b18c9ecf54feb6688b706e2d2529d8c6ff763767d0539475ee23d11bdd76dd236da639f70600c2669b1e6796580a5dfd3d4c5c9491d79e5fd199b48 SHA512 2f360dae9c7f5d298224364fe02dbdc99006308a476b989715111b77710c4c805c018ae95c8c699db34776f74b24e326b5dcb90f4795d0696cf1c40e8d4cbcc3
+DIST genpatches-5.17-12.extras.tar.xz 3932 BLAKE2B 3c0b16365f2ddce7aa5323413a19ca1b37fce7cef2d0ce15e47b54dc3450f6cd62ec64d5913ae2817c302ee4fc2556f9e6316a7272aafcd558fc309b3c00e369 SHA512 4eeb7ee2649edf630e70f82584c278b4f6758e2937c3b067575286a3353883baedbbbe578222bfa187674d953b036ee2f1c89d001030efb1db6057f6d264f9ee
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
-DIST kernel-x86_64-fedora.config.5.17.5 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
+DIST linux-5.17.8-xanmod1.tar.gz 202313860 BLAKE2B b97779f3898c20c5db978464895d3459dac189b1be7e6cf9d3cbc2bf9272e07f320378575a8149fa5b27f456d3bb718fad2346198ade86da1a850ddd295f9365 SHA512 58528fdc5ae2613b80daf831c38cb4861a9b50ced150b2624d3df8a257d7106c1a698a5fb62d5c4a0c066fe689ac8f1d0e4b4e7586a7d326b61700f16d5f85c1
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST patch-5.17.5-xanmod1.xz 745504 BLAKE2B 2c17607c0eab5afa0266b1272785cb57b83628f3860ab391766f5068514526ad009892ecaef7157f328669d5b3acea5527f3bafb44d0e67f573a83a47a41fbab SHA512 7d6df43d8a7e11e287b22b80355465d8f24fabf42d6f3cd41567cfa98489b40d6a336c392453961c85f85161532df5781f5422a1b8922500e2441c62f7062058
 DIST patch-5.17.7-xanmod1.xz 830980 BLAKE2B c82af72bcf873e4a0d97ccdef2a474dd9345ab508e49052ede232277a39ac783a8e9af91a7b134bdf73cc292f30b5460e3c3ce07e09fb0ca539c1c26b76a14ec SHA512 d04fa88053fc9bada86646abd7d2ab6e34004444d8c1711e9469fae571660b29433fb27133ba3e137146c7b0fadab5df7b84de2f2b55d4e4239ef85ab5283943
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-5.17.5.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-5.17.8.ebuild
similarity index 73%
rename from sys-kernel/xanmod-kernel/xanmod-kernel-5.17.5.ebuild
rename to sys-kernel/xanmod-kernel/xanmod-kernel-5.17.8.ebuild
index fb03de9..fe8aa74 100644
--- a/sys-kernel/xanmod-kernel/xanmod-kernel-5.17.5.ebuild
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-5.17.8.ebuild
@@ -5,30 +5,22 @@ EAPI=7
 
 inherit kernel-build toolchain-funcs
 
-MY_P=linux-${PV%.*}
-# https://dev.gentoo.org/~mpagano/genpatches/index.html
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-CONFIG_VER=5.17.5
-# Commit hash from https://src.fedoraproject.org/rpms/kernel
-CONFIG_HASH=f20aa9d1023a1912c5ef522d47b7deab27fae207
-# Tag from https://github.com/mgorny/gentoo-kernel-config
+MY_P=linux-${PV}-xanmod1
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
 GENTOO_CONFIG_VER=g1
 
 DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
 HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
 SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
+	https://github.com/xanmod/linux/archive/refs/tags/${PV}-xanmod1.tar.gz
+		-> ${MY_P}.tar.gz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
 	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
 	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
 "
 S=${WORKDIR}/${MY_P}
+SLOT="${PV}"
 
 LICENSE="GPL-2"
 KEYWORDS="-* ~amd64"
@@ -56,14 +48,13 @@ src_prepare() {
 	local PATCHES=(
 		# meh, genpatches have no directory
 		"${WORKDIR}"/*.patch
-		"${WORKDIR}"/patch-${PV}-xanmod1
 	)
 	default
 
 	# prepare the default config
 	case ${ARCH} in
 		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64" .config || die
 			;;
 		*)
 			die "Unsupported arch ${ARCH}"