diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index 2b4f89e..46509d3 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.4-12.base.tar.xz 647340 BLAKE2B b0962b6a6b0c07aca1f27abe48e9a1
 DIST genpatches-6.4-12.extras.tar.xz 3696 BLAKE2B d5c97c078e4abe4df885f067dd2202332c607452ecba07e0797426186b7bc2fac2cf6d876a269fcd8d2b8f5a33c8f36b97cf080d61bcff58ba8247b3a5376ad0 SHA512 5fe6ba9e4b8efddb7d305fd58825080862628ccd45fafb729756592a31d1ac6cd27f62fe89270d1ac30d54b99a617e4f49c127a3752a10af493ee9df3b113002
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
+DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
+DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
@@ -16,3 +18,4 @@ DIST patch-6.1.46-xanmod1.xz 2494048 BLAKE2B fe1684f53708d0e2706db4b75502aeaa125
 DIST patch-6.1.47-xanmod1.xz 2530012 BLAKE2B 4415d01da127af74485195aac5af1214fb685ad94ad09336f5a6407f9f3a8a9a2187499c006ab52b1740d249352cad48fbd9e9db294738cf350df0b85aef7a73 SHA512 b78f7e4e04f358746481d117f6b186f6d4bd8910d93b77a4850d2209b738ab425ceedb05c21aa004c58aa83599bbc5fa7abf71b0639f86f6547fbbdea1ab798a
 DIST patch-6.4.10-xanmod1.xz 775816 BLAKE2B e6df15e544df872670893c66aefaa63a7438830416850bd03de75b8438ba25f220b4e5fe66ec3ec2a5d08d6d4ba4adacebfcf7f8d148502691afd78e62451787 SHA512 92486eaab664ac00669f7955d6f42e6fc32b1fbd6e29f2044b6b76c95c861274e78ebfca6eb1513daf0573d441f97700a2c50d71644f00bf5c2367af6c7b5a9f
 DIST patch-6.4.11-xanmod1.xz 832920 BLAKE2B b478f99d8b913a7d2c47760f58ec342df2923d5717977df1d2d373f29b620f1b42288a5972a88d4772fdc5c7e30bb53ecfea392546ceb778cd22ad94baeed124 SHA512 70af2bf9e1a0cab7542fa2f5cff48ebe49ea47bf438086b932975832f02ca65cc8f1fc4b1c436c08c54867e74a1c30a3802b0b9f4073600d405ec6a778782590
+DIST patch-6.4.12-xanmod1.xz 884548 BLAKE2B be0e56b5332401ffc61d738501b00d68dd6945d9660de50c25434a1484060754726bd0b32e7933ed037ed8cbcddabd5e357001df0bd45b9cf53aa27fbe0cc63f SHA512 ed88e380375d9fe89bb57c26c616d6b77c3a5f56d5c502291f64a3731cb992719f3f0550cd387ec584fbd047c2b53983276d108fffe3670b4f758c8e6dea0ca3
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.12.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.12.ebuild
new file mode 100644
index 0000000..d69b0ad
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+GENTOO_CONFIG_VER=g7
+
+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
+	mirror://sourceforge/xanmod/patch-${PV}-xanmod1.xz
+	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"
+
+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" -exec rm {} + || die
+
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/patch-${PV}-xanmod1
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	rm "${S}/localversion" || die
+	local myversion="-xanmod1-dist"
+	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
+		"${FILESDIR}"/no-debug-extra.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/dist-kernel/dist-kernel-6.4.12.ebuild b/virtual/dist-kernel/dist-kernel-6.4.12.ebuild
new file mode 100644
index 0000000..9cb3a33
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.4.12.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+		sys-kernel/xanmod-kernel:${PV}
+		sys-kernel/xanmod-kernel-bin:${PV}
+		)"