diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index 223ae58..da3d79c 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.15-85.base.tar.xz 3424456 BLAKE2B 3b5dd1fbeec6ecf40e922ad97662
 DIST genpatches-5.15-85.extras.tar.xz 3932 BLAKE2B 466a3564c1d693c90d925457720960f79221d99f740b5ef67152dbf957d9c44a07b867e916cbedd32c92e268341bbe05d3fe40663e55c358cf4439d3a343721b SHA512 03b9f051fe6a8415b693a64242d00a457f7640dd8fd6ad9659da8deda9ee77b8c52769bb60ca5194e781696e80f703ca17bc1277b1979e1f79e99144a30ef664
 DIST genpatches-5.15-88.base.tar.xz 3548532 BLAKE2B 947258e9bb979febcca994f82b9ca18df494ac0d7db4664a96ccb4737ac71151f21070d30e4e5665c53d4c444bf06471590a14d17f83396809ee9013064db317 SHA512 e071daa0620c62e5ba273c6f5c4134f7c6f179b25a7dbc10e1f045b6becef1182e0f27620be0f03f32926d5c2109f7802335dea9caac1d576c47bf92c0532045
 DIST genpatches-5.15-88.extras.tar.xz 3932 BLAKE2B d504a1d8dc4510e870c34d5e355944d2e79646102ec04d5a268774e29ead5255ae6cd51f3de1b10992c8bfdfda3dc16379b3e6aebbb18bb528caa801551498a5 SHA512 85d01fff2ac04bb439ffb2a648d665358b5631f086db51b1ccadf31a8a74f94445c5942d6ac25676aefeb7a86f3286a8a7320fcc30bb092c212f2061d3143263
+DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
+DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
 DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022 SHA512 c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45
 DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
 DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
@@ -13,5 +15,6 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST patch-5.15.81-xanmod1.xz 3469480 BLAKE2B 1c02e1482536f86d698159554c83819cff476bf790dfc7d108fc771e96c6762b14e69b9c9527a8a9c7245b458543bd26e8ebcaa5afc57ec145af803bb04ef7eb SHA512 594cb915c9e2466af198f71b3c79090358ba9ec7b4e76c2442cd3375b50a1add8972b29a5b5d21d508f907384764f7acc54a39d1d7effe8991868b47a3aa8c0f
 DIST patch-5.15.84-xanmod1.xz 3515988 BLAKE2B f070bf55a1ef829edc8482679715e415da8b46d0edd06cb538256e755c2b3818195bb669fa4a984719efdf1d1497e22e45f0b50742b3f840cc42197a56f9fd9a SHA512 6c33422f6da0babaac815e413d6e2b8a196d952afe49206b00517cac57777ca5e159ca4ac00290576e321c3e469764c5a730552d0a094e1706abf0976008715c
+DIST patch-5.15.87-xanmod1.xz 3734240 BLAKE2B 9935b3f1c555d52c292d61284fbe7ad532867849714877850acc16cdbe2535008bdbc422092b02907bba46aa366ea0b9aa35d0a251204f6a6ecf146fb8c13608 SHA512 4ba0d2058795ed1af7b01c70df48e7d1525f3406e5eafd688e30ea7c6c03d9f12f0560bd1b783637278e62c56a0548b814545d5cd4a9a9f9024fa827019eeb5d
 DIST patch-6.1.4-xanmod1.xz 540676 BLAKE2B ce1bbd48e8f9b266a14aef9cba91419d3efff90abf6d11643939875f66b1118cea7a1722bd9c21319bddcb2eefec958988741f6e745cbac395b2c854305d4398 SHA512 2f80db5b427b7d9532b1dc398475b8fce203e2cb6cacd9a1a84b20262afa4fd006ccece34668e0be63c705b7321a194e67df96328e0cd5b1f00b4887278b85cc
 DIST patch-6.1.5-xanmod1.xz 592228 BLAKE2B ec4c53327281f8d7a3a3bc6cbc7533c98afcff0e39426da5de7c24e5a8abbc24481585a185189fb8a2cd928af925668fe5684cd57e4f121de50703744cad679d SHA512 ad38696176e1d25b11a3fcbe13af8d16029bdf5758b9f7cc68d3a63151992512252c66b2b1397a0143975eb92817e2ade80a16dd911824a3a47683c658317d76
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-5.15.87.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-5.15.87.ebuild
new file mode 100644
index 0000000..1556547
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-5.15.87.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 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##*.} + 4 ))
+GENTOO_CONFIG_VER=g5
+
+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"
+
+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" .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-5.15.87.ebuild b/virtual/dist-kernel/dist-kernel-5.15.87.ebuild
new file mode 100644
index 0000000..ad0ed82
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.87.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}
+		)"