diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index 26bf105..78f34da 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -1,7 +1,11 @@
+DIST genpatches-5.18-11.base.tar.xz 547804 BLAKE2B d0550c546e93b806d96c8e64c5ea90d22f9675f2c6a020032ce5e35b7401601c79d2849c0d82cc53673e6c22fafc975035509079253f235c7db769fe20670e59 SHA512 4301f61e38ede94fa5c6e02f67e22dc32cb1078463aaf641ac81d959444e8088c1e7da6c3ac7d877f1f94777bf14de1a24207caaa8c560fdfc352a6972ea5b47
+DIST genpatches-5.18-11.extras.tar.xz 3924 BLAKE2B de48f32f46f5d8fd8cb607490eae51338e6e7e94501e2e1ded2c990274270d80c7a883ed227203cb7306c0259f8dbe226ca3ae271eab76e367eae0ca7bd653e0 SHA512 bcb9190ba00f1028ede7ec7c18615260d8de263f508cd9c543938c6dc0fc9b0be856be386af4a86770562453e094e1794fad064baffdcb4363cb128abb35fa75
 DIST genpatches-5.18-4.base.tar.xz 51808 BLAKE2B f9a33dabb82687789f6f778b1eea29e29d1ff8601954f6125530cd98a88b9469c3255c0858c767806580b018be9a4bde23805240d266f0b8cb52a3031bbc836c SHA512 7ddcff3c89328b0fa1c25fffd595f13b2ab9569d9387a503937c7f58f44e0ab4fdda53b260a476316c85e9459a439be03cf875683b594a6a3b10c4320d2a274e
 DIST genpatches-5.18-4.extras.tar.xz 3924 BLAKE2B 9d555b98ccc35b3d42caf7fabd46756b18ca121a80b041a1a44799f283cd6062e0023618cf94867baebb7ab9c71b8a812f75beded436eaaab79ac52674e8242e SHA512 d9b75f29090f45b801fb94f7bca4d5ef9458d243ea5719059a427f45ab045be1696856dae9c47b43f08c70024de5e29e08bcf78179f684cbec797063be97987a
 DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
 DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
+DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST linux-5.18.2-xanmod1.tar.gz 207126257 BLAKE2B 24f84b5f125994b3339193ed82fc0f1d4d1a959c33d05e988b6108bef1007415f6d03854dfe240c3a76821f768bc4aad6dc19b47ed059c1c5aea9ca3cb028dd8 SHA512 b444825e1901ccef281ce5b34f0e7d13d53acd135912363b41bc868305a3fa75fa5bcb76b0537c649d82ba7063275ddefdba421f24ac40af36a7c55105a7557c
 DIST linux-5.18.4-xanmod1.tar.gz 207164026 BLAKE2B d159eb399f26a51acf33257b04a57fe28d555c2afa86b2ea0e18c27a9d9a55616b20edf7839ad903d51ffae3ea1481ead09f56ae89a68f31746bb91d0ca95c09 SHA512 0b6b5d58d5e27e60c19445c3a45fbc2fef62eab12f00f17112f0d16e8036ef654f463231c1902c992adad23335d1da72d2965553d0fffb22eb58ffc94f8b0381
+DIST linux-5.18.8-xanmod1.tar.gz 207182046 BLAKE2B 89961313073ac40dbd78c7763b327edec55c04109495f8fa330f65f27620be31ba9fde208454cca93eabbde1585dab157a70f61162886b958f0a437dd3f1a440 SHA512 eb156c79c6bcf93232d52354b33587dc20d212047613989fc11e250137de475376bd3756df106fdac0008b33870d9a297ad4b238058078925959a349916d2057
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-5.18.8.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-5.18.8.ebuild
new file mode 100644
index 0000000..0359bf7
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-5.18.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV}-xanmod1
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
+HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
+SRC_URI+="
+	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
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64"
+IUSE="debug hardened"
+
+RDEPEND="
+	!sys-kernel/xanmod-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	# Remove linux-stable patches (see 0000_README)
+	find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" | xargs rm || die
+
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	rm "${S}/localversion" || die
+	local myversion="-xanmod1-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}