diff --git a/sys-kernel/xanmod-rt-kernel/Manifest b/sys-kernel/xanmod-rt-kernel/Manifest
index ebfc3f1..df67cff 100644
--- a/sys-kernel/xanmod-rt-kernel/Manifest
+++ b/sys-kernel/xanmod-rt-kernel/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B d0f16f9b2f09f182c02fdb6cfa4b7
 DIST genpatches-6.6-57.extras.tar.xz 4056 BLAKE2B 9b071880383921fcc8cd2da092e1219e3b40684e6ffd04bd2ab75fd53624cdcb7289f1c40ae9256e0343bbea92393c153724ee628e8d164596ba4d7f8bb413df SHA512 a61cbf855e718ca7afed0b15614ad2e9bea740412e8251b35417d10f4b936364cc3820951acc45be2b18cba635cd1c43da8caeb4ac315747d02201be39148c8b
 DIST genpatches-6.6-59.base.tar.xz 3174716 BLAKE2B 8eded8d4d4c343869f587ecc2a218d124c34618494ded9d17b493f26894e545658021ad9cfa05bafd14389de07406f43a722c37276cc14096a3a7a00040e2ae7 SHA512 88e5ef8de0954f349e5c0745adb8f718dcabcd2e166c597c9de753c892eaad42c936984279fde86974b307858959cdef401f92f6f62a98bf1d4bed14cbff821e
 DIST genpatches-6.6-59.extras.tar.xz 4056 BLAKE2B 8d68a426082bcb168f74abb849a7a58090268c9cf098aa8982d9e700fab754a6f42dd833c1ee5d44d52f58d1a6b3da018a954d873ba131a2049a286a39ca3099 SHA512 ee133a7efaeba2abe242482825f4490e1c1b17fca64f9183713dca601fc64048288aa79125f7b8c0715f6c4fb158ea3a230e76b39b63d1a59dbecf80697ac000
+DIST genpatches-6.6-65.base.tar.xz 3582916 BLAKE2B 3d750c677e61c122144de989a55db6f04a2a545981858b71c602c156f802478ad19f4d87629760be724a9b522b377479df9f0c5f9a859235c5fc438df95c2aae SHA512 1ac5e7fb36e50227a6bdf035562f11401ef6a19c1a7af2d001d224b8710e3aa10434d828a3a0213a1f5cce101992bb803199e5d4e76474b657dc5c4d6328c385
+DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B 53cdbf5d680c9943d189e7606caa10c18bd3317789ffc1f120bf535255d80bfb5e3969fe952eb0da3c1001ee41e93755616332363465d4714a67a90140c43bfb SHA512 b5b3c817426be391a72633740beb4ba7b4e2546ee441081906d77ba31636321501af414140d487d284de325f80d004aefb241f3e349ef3ccd62d2c6fc4d7cf7e
 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
+DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST patch-6.6.49-rt41-xanmod1.xz 2950392 BLAKE2B cdf560cc0ef21c31081d63b45b070f33fd7ec8e446a8f92bbd45a5ae7c76cc782db7b3dcb0718912739f4d2938315378e9fa859beb987ff4c0c24a0d40175468 SHA512 a068453b5170e623c85da2d67174de96800190278e0bf9df90c530d1627c9762b34eb5c2b2cc81e9a43fb2bfd4d2b4ed0dd40aff39758f6b4d7e6bb2da36d602
 DIST patch-6.6.50-rt42-xanmod1.xz 2982744 BLAKE2B c6ef49df43c5ab3f456d8f41a9429db5079f304e21ed87f034b3d0f36ceba073f64cd92d2fa728fbb0940a73ae1d6137e8ae25f840329250bb73b72d1d161c2b SHA512 7b6e3008077dc038f9bf46bf0c69c09eb65516ca74d40814fb8607298cf3eaf9bc5e898b87de0972ef72a9aea3c25f456462c6ab1b92b4111cb9ffa22fecf463
 DIST patch-6.6.52-rt43-xanmod1.xz 3060252 BLAKE2B e273ca945b3745e7e0390e180258ac9d68ac67aa3786cc13c5821e1512508f617ff3685f5fa7f660475a0c85638470f0196738c6d9d9b1504878f03025a7cf49 SHA512 4f0b6e777a2df72594093505c1cb3a8ddff2bab415c6b3f15c75ecc3176045dc8997e00b868f26236dc710876bb760fb767d5d96f8fbd04cbbd1bc6083b384c3
+DIST patch-6.6.58-rt45-xanmod1.xz 3383148 BLAKE2B aa6865400a823088a9eed0e0df81fb01d7d8e221c816151bf2ef9df016d3adca96006c01cf91d2f10f527dca231147f7baeae8c6cd6aefc328dfefcea19e27df SHA512 3d30265f97c250a34c3e2fc2b5752b6774d7a4f57dbad0edcc4bb13c96c4f22326470ff467012798c0a3c2a6664e179165a1296da12c59b1bf3f99c42dc677b3
diff --git a/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.6.58.ebuild b/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.6.58.ebuild
new file mode 100644
index 0000000..a381503
--- /dev/null
+++ b/sys-kernel/xanmod-rt-kernel/xanmod-rt-kernel-6.6.58.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+GENTOO_CONFIG_VER=g14
+
+XANMOD_VERSION="1"
+RT_PATCHSET="45"
+
+KV_FULL="${PV}-rt${RT_PATCHSET}-xanmod${XANMOD_VERSION}-dist"
+
+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://downloads.sourceforge.net/xanmod/patch-${PV}-rt${RT_PATCHSET}-xanmod${XANMOD_VERSION}.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}-rt${RT_PATCHSET}-xanmod${XANMOD_VERSION}
+		"${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}-xanmod${XANMOD_VERSION}-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[@]}"
+}