diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index 01d33d3..abfabbf 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -6,10 +6,14 @@ DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aa
 DIST genpatches-6.3-11.extras.tar.xz 3804 BLAKE2B a3f7281d932090f92e4f230159d30a1b03e15e788cd03808f86d03f8df85bf0fd3a77871148af2eaae8637ea0b65e7e2c6ef9e02cd0992cc0b51924a422c5b6d SHA512 6a9d694ac9a9b3af9ac89d60fd48808fb70ee4266dc60deaecc4c2a3a48ec00aadac2074dd6cb86b698415ab24fb9b2da7284a85208e63cac7a4ec50eb423e92
 DIST genpatches-6.3-12.base.tar.xz 691736 BLAKE2B 533383ee5f0bce440f9ceff66b75d742596d22113367560cf364243d90ee418d84868adedc62e74202fd5cc1c67e8efb8fdddae35e7ba12d2026be252b4005cc SHA512 8bf1fd11b3d5c3346923ce573dbc730204370b033825b9650bce83da2292dd8ce253e7e60bb23fcbcf902d0cef6b4b4b335df07c1db4c5fff477d2fece6e6489
 DIST genpatches-6.3-12.extras.tar.xz 3808 BLAKE2B 08914680602e3a59ccdd2699b60b3707e40bd2dd28c87170e78701758f50ed2273d7b4b7e238cc6d6ae5819c48c2c8e744056e0ce964dfc900fad44dd628da5d SHA512 f99775c2aece8d77fb432fd9a013868d85cddba6546b6fa489c91b085b0ed35fc14e2e23c922d5b34f677994749e050f837112aa6c0ad171278481eca257606b
+DIST genpatches-6.4-1.base.tar.xz 4304 BLAKE2B 66c721dee77d8bd64257000dcdc5ae8ffb1141bf8634670a57e356a1cfc9e73b26660aa63293f6d02bfdeed04db54f8b1a224ace9ea614bba172f593bd0c8918 SHA512 55bc76b8f4c4ec09419407b6a32d9ba1814afd0e30309edc5503d428ea78c6632d48e25781c8e9308ff90c96214ecd0cdc6e8f942614c9a9bc1dc2307ee4ee43
+DIST genpatches-6.4-1.extras.tar.xz 3700 BLAKE2B 22a7977323c67d814184f3bac199adf6b1777a6db6a23ca72ac87a61b91a0a72b51127891412ea61c136dd9273a0862341d547daa27bc41a1f158274b7d3c294 SHA512 be85aa68830be0bee308a675c46675e25461f5f58d7dcf3fb77217de6ac28600c50104951550167c8b7e5de50ff37a01e0127337a1ffa4bb2e7ce1389ab91c2e
 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.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
 DIST patch-6.1.34-xanmod1.xz 2000856 BLAKE2B 71a6faedd80d96a85b028b3cb7048dcd544ecb6852b109077a4d8f7e0a1e10c9759990166cfb51ecfb141716bcf7c842e88cc31566ed0354566e06522be09913 SHA512 e4fa5ff278861527d541ea0d4dfe86c8649d8e4791e711950ff90a7f8bfb9eb7f22e086046b0e5018e83e5ddc59fc260987faa78f41a70375fe5b36c8f3c5f7b
 DIST patch-6.1.35-xanmod1.xz 2041668 BLAKE2B 603aaa663bfd099df23c0f2aa4463fe1c1a473f80ae4b9abf474fb9e6424a67a3e52c98eb24ef9cb5bf201c5756ca3266427c2ca2b7dd0d1625bfeff74e294b4 SHA512 3a693954ff6d1ca96c6007045ced149f55e87ce347c1d84aa7e226be650e4fbe932e57e4a26a4d2078a2e00a700f731e4d0b394292000925e59be2e0c753bba3
 DIST patch-6.3.8-xanmod1.xz 764916 BLAKE2B 81479f900567b6c13f64a6431dfdf3581f64ddd3ae20454e3ea42e4066198f9b146f82b3668c166c813ada14b9c93353fbae7fc1866fd20b2dbe801b8434aa40 SHA512 b922408825e1768487398a3894da739af348111a8fe43da8b0056ae46206f793b5c85145e8b57f4182595c26efd8b4da066da0aaf78d2b0242b41bba6d524c6a
 DIST patch-6.3.9-xanmod1.xz 813640 BLAKE2B 53a9313a42cec247563a620ec251f1c2f6ab0ff43fad5261595d2f97d738b011ddd521dbb42e09effd67cc32630c4b25247963dc29708ebcc02614e8036a877c SHA512 164beb6ab803db7693df697899614c6f5985b280c02e4f62d9f9bfee2ea1bad729e192fcce172d2fc57472afc5b4e4757425049e5e526ad1a15a830eb829fb9e
+DIST patch-6.4.0-xanmod1.xz 149876 BLAKE2B ba9f06364a3877f2cffc1a74a928586836c21d0eb37615960991c2baa04224f349624e216e598f534bf84bdec159947de7e9a762fccffc96bca51b9fe0a5c9b6 SHA512 c23240b2d68e75e061eb706bc3b1d1113e416686ec2a720e813da59f42a34cd3199320bf85446c1cf21fb55b1b7c91a779219bb85e944d489cf4d0d250fe4e08
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.0.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.0.ebuild
new file mode 100644
index 0000000..8755e72
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.4.0.ebuild
@@ -0,0 +1,78 @@
+# 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##*.} + 1 ))
+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
+	https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/dist-kernel/dist-kernel-6.4.0.ebuild b/virtual/dist-kernel/dist-kernel-6.4.0.ebuild
new file mode 100644
index 0000000..ad0ed82
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.4.0.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}
+		)"