diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest
index bdef378..496d83d 100644
--- a/sys-kernel/xanmod-kernel/Manifest
+++ b/sys-kernel/xanmod-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05
 DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
 DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
 DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
+DIST genpatches-6.1-4.base.tar.xz 350692 BLAKE2B e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808 SHA512 42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24
+DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c SHA512 a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
@@ -17,3 +19,4 @@ DIST patch-5.15.84-xanmod1.xz 3515988 BLAKE2B f070bf55a1ef829edc8482679715e415da
 DIST patch-6.1.0-xanmod1.xz 137976 BLAKE2B dbce20ccd85633b9d5d2461afab6f60ce3736d81d1d1472d425b9c996302b5d06bf4c52678b7bab1aadfec2458d9d2844bdca871aa031d90f4ea8afb6f1dc066 SHA512 8d63970527f53fa727ccc9e1e1042cd18746cd3c98822999b155c44ed4431b4e4473d69533c9e71faa188980bad3657ba9cbc92eb9839e81ed3c28afdeeb1218
 DIST patch-6.1.1-xanmod1.xz 148752 BLAKE2B b7aa8be77e166d2c473c97ba0fe8582af0c62a0c28b28792861ba315742ed1359408b4008da6f7875d741df48be1836b189629dfa85edec0705b97fe518be33d SHA512 ee1ca7baa77bf20b4572200b42b40031441880f71aff3574391fe4210a810eb2863878b2c12127a7ed6fa95ba48db4ccec5136b58812021904cda62c3e2e4ef5
 DIST patch-6.1.2-xanmod1.xz 458612 BLAKE2B dfcdc9188340da50662047854e1203054bd2fd09c253415648f9e64f0e515ba91ce0d3c3246499881bb8949b6aec0858ec64ba07d6ff54bc2674f3e88dc94200 SHA512 cf289551364f0ade197d7d19e1e04f6d56c7519a2f0ec6d414df1b1b8b2058d60c926f1045edea5f3dfca260b0bbc938343c103853a7eea0f00b493b7e5a64ac
+DIST patch-6.1.3-xanmod1.xz 476984 BLAKE2B 850fb807e1dadba44f37d09006b425911713ac2a850c29dc5ec3f454f1f7468181b810c4fe8555df952b7307dca36826d57b6cd1c50dd38fe8f5d1462db71093 SHA512 aedebc5075a4676c44638eea71b809a48046fda58102e3eec9e2cfa284ea47d1fdcf30b327381d3438b96fd9e118e45f084eedc4a75b387ab99104a295fc5ca6
diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.1.3.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.1.3.ebuild
new file mode 100644
index 0000000..ee1752b
--- /dev/null
+++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.1.3.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##*.} + 1 ))
+GENTOO_CONFIG_VER=g3
+
+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_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.1.3.ebuild b/virtual/dist-kernel/dist-kernel-6.1.3.ebuild
new file mode 100644
index 0000000..ad0ed82
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.3.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}
+		)"