diff --git a/sys-kernel/xanmod-rt-kernel/Manifest b/sys-kernel/xanmod-rt-kernel/Manifest
index 733e2b8..5d289f0 100644
--- a/sys-kernel/xanmod-rt-kernel/Manifest
+++ b/sys-kernel/xanmod-rt-kernel/Manifest
@@ -1,5 +1,8 @@
 DIST genpatches-6.1-77.base.tar.xz 4198960 BLAKE2B 9c6921ca87ec2c3338107a994d6e094c6bf4ca5a705f21b3efa2803454327782ccf2cefa78b2a1bfa59413402d5d89b757a5522b86943c8c8c5d97592138758a SHA512 34daab45df35b30a5bc155aa82b074f6516bb1af7b2976590f88d88e25f6e8ae369fd1299f7e2f645c045b29d6b805dd07291ab45c212a9aa27df566dd6aca96
 DIST genpatches-6.1-77.extras.tar.xz 3816 BLAKE2B 2129b36991f127c4bb4783a535a2d58bbe8ba9f4f139f7b70bf41a1c54bc2ac9026cdf3e3662f47c28118844ff40b6ad1c8da1c5fa8f1f4edc768fa69cae2083 SHA512 1de0ce45d9a0a1555faa92842f884cbaed8f5e727e4e59cbafc31326c9a183acc4954b2cdba1bec2019466545870ead8b5300f419533e30386aa2a36f6606a9a
+DIST genpatches-6.1-82.base.tar.xz 4335544 BLAKE2B ce5397b5d00d226ecb13f97defab280bfec46a7e4a626f9579e9c348cba80d50c3c73505215418e20bc508c43453b6112159e2e7696a4abc7ebd9ff403f4eef8 SHA512 90c0fb104cb67666b38d8e51ca87658e771fdd4406537b919f4b47d5e486407f9729bb2df1137cc4fd5abb530fa71723a5157376c11cf75625b4cb190ccc59d2
+DIST genpatches-6.1-82.extras.tar.xz 3816 BLAKE2B 3371d009143a2bea266308d2369cb114434c0bc96453e0d87cd39d9cbb8b2984f9166e78ca06471af873ea8a286d5f9065107102625d283fc85bb1c21d92ffd3 SHA512 da9a7b58e8907b3379ebc6c40b084c852c5b1090989f5eec8b1087e5706a9c9b1fd87772f1f0efbe18128e85f4d0b76ee4e10b6c6bd409eff6930bf19971b7dd
 DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST patch-6.1.69-rt21-xanmod1.xz 3318320 BLAKE2B d156e64df92d079346fd9aa488e4cfbb6b7cc70e93e4d2e3ee566d2b5feff6dae016dd4db4c9ec4f1bd00138ab9038e57b5dc4a70ea73c99283a9b0bca67e3e4 SHA512 cb02754fe93b3fdead3d0e9354c219e51e2c5daa19fa0c74c4a28f185aa1bb6018d706315b44d3b53d59e2f5ff712dc363f99818a6ed04e841ea3506c8d5ddfc
+DIST patch-6.1.73-rt22-xanmod1.xz 3429532 BLAKE2B 7640345fe7c8344c22e0b8e918175eb368601e5ff05b41ac8e268eb75954abd5a0aad1b24d73096ea3a648bae098cf57c5cb3639cd7fce9b664a82551df5ea9b SHA512 c2d4cdac04121d28bcef57b63a68bf369d99352bf5b2cd60e757f207c9ba69f1c727b87bd1e0a4ba222a1cc182b67e29b5a3527add67b6ded852fe6e9fb9644d
diff --git a/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.1.73_p22.ebuild b/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.1.73_p22.ebuild
new file mode 100644
index 0000000..50c8b11
--- /dev/null
+++ b/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.1.73_p22.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+MY_PV="${PV%_p*}"
+
+GENPATCHES_P=genpatches-${MY_PV%.*}-$(( ${MY_PV##*.} + 9 ))
+GENTOO_CONFIG_VER=g11
+
+RT_PATCHSET="${PV/*_p}"
+
+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-${MY_PV}-rt${RT_PATCHSET}-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}
+SLOT="${MY_PV}"
+
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/xanmod-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${MY_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-${MY_PV}-rt${RT_PATCHSET}-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="-rt${RT_PATCHSET}-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[@]}"
+}
+
+# lazy workaround
+kernel-install_pkg_preinst() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local dir_ver=${PV}${KV_LOCALVERSION}
+	local kernel_dir=${ED}/usr/src/linux-${dir_ver}
+	local relfile=${kernel_dir}/include/config/kernel.release
+	[[ ! -d ${kernel_dir} ]] &&
+		die "Kernel directory ${kernel_dir} not installed!"
+	[[ ! -f ${relfile} ]] &&
+		die "Release file ${relfile} not installed!"
+	local release
+	release="$(<"${relfile}")" || die
+
+	if [[ -L ${EROOT}/lib && ${EROOT}/lib -ef ${EROOT}/usr/lib ]]; then
+		# Adjust symlinks for merged-usr.
+		rm "${ED}/lib/modules/${release}"/{build,source} || die
+		dosym "../../../src/linux-${dir_ver}" "/usr/lib/modules/${release}/build"
+		dosym "../../../src/linux-${dir_ver}" "/usr/lib/modules/${release}/source"
+	fi
+}