diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index 682b405..afc871a 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -2,7 +2,11 @@ DIST genpatches-5.19-11.base.tar.xz 766852 BLAKE2B bc8fa5969dd4c75920a094b5135f6
 DIST genpatches-5.19-11.extras.tar.xz 3804 BLAKE2B 3186d10e8a31ca501f36ae3e7945acbba7a17cd7d006b51a7a4136d2c1064efb070fb7870f4b1959eb87456131608b5d31a91987c79f8720b267537a38643211 SHA512 10c4b7c51bf4a891ee04826df0da29096e31601126435bcde168f7c3d32416395844e03d3fd55b9b225c7c8dc0216ae8691705c53786f06e0350f6fb1ec03f69
 DIST genpatches-5.19-14.base.tar.xz 851936 BLAKE2B 8850a35f62720a0b12216414e5cf40a934e8e38a8346824688554c770189a25c9c56de312f98fdca7b3d4b7a3811102af9fe8cc869f27116efd28dd1d4a5cb4e SHA512 d06a54043845c4506cdd4c164421c818abfb0b8b48e20a28fd25fa634775335118a9687fdc5f886833c24d4185c8aac186988981c02f05e1fe761bb409bc2e3f
 DIST genpatches-5.19-14.extras.tar.xz 3808 BLAKE2B a6bf77870b14ccb61e0fb2ea0400fb83538491870bd84c9039074d8765d6cd1c0bbadd16b963898a0e01f7808e320006d9823482544a61bca551ca624fa5d87a SHA512 e7bf591d2fea8d4e9b7678e2189953986521a8a01e7cc470005cc1fa8608b73d716cfec02c87e849578aa8581317899a48aa373c683bab3a67f05098f101d94d
+DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a14108c86e89d2611e7886459405b743e690b5fa9f682a3e8ad3215c821f4e04552978da0e309be9cb586f0e2fb53c50f SHA512 da56f7e72c400aa149d481fc42651debea9ff90144b4d731dbd167cd5061da63f34b1b4fc937c8a3508f9bcdbbe3b645d25cfa67ce05db1d5c25667214840d9d
+DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
+DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.19.12-xanmod1.xz 903844 BLAKE2B 559a284bc22945a6cc94b060937db090d57a08b266f33c0d4dbd24c06e9a3ba52913655ee9b5c371423f506ea2d3a586da38fa26060bb6fb61a7aea990aa0a9c SHA512 6d7f2bec8464990d10473adbe44781be0d16be84a4fa4266a367e3695ca457271bfc7deb90b8d0e8720ab6c5e591136e51739818f513f7c14da35e611df25a79
 DIST patch-5.19.9-xanmod1.xz 825756 BLAKE2B 028b32223623758ecbc2e86fdb79c73f4d95b174fda872f9da71aa3c43e208d5d464b971b4b0bf685e106104b313c0fa9ac8e47b4fe44389fbcaf1137c2711cd SHA512 76bbe03d9623854439c6b7d0bec2859387589504607222d7dd015637e3c08674a3bb2d55111127e28b0a51bab371c0e73591e4389ffb835af50845f7c8a46756
+DIST patch-6.0.0-xanmod1.xz 383992 BLAKE2B a085daf0bf50877edbbe4f2e1c181118df2263f597d4adf94bd95fd049561e6100ee84b26e142acc1e24916490825e6b9bb68dd3943ebc11c12db3e85f89fdea SHA512 835ecce1fc341fbf251d3664d652d54541af273cb256a20a8b53080b44176f489461fed042004829d3902e266e8f2c731a1b94d0fe4c1b1ff21fc460331be1ba
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.0.0.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.0.0.ebuild
new file mode 100644
index 0000000..9e370ae
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+#MY_P=linux-${PV}-xanmod1
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENTOO_CONFIG_VER=g2
+
+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/~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)
+	if [[ -e 1[0-4][0-9][0-9]*.patch ]]; then
+		find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" | xargs rm || die
+	fi
+
+	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"
+	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[@]}"
+}
diff --git a/virtual/dist-kernel/dist-kernel-6.0.0.ebuild b/virtual/dist-kernel/dist-kernel-6.0.0.ebuild
new file mode 100644
index 0000000..ad0ed82
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.0.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}
+		)"