diff --git a/sys-fs/bcachefs-kmod/Manifest b/sys-fs/bcachefs-kmod/Manifest
new file mode 100644
index 0000000..f7f2ec3
--- /dev/null
+++ b/sys-fs/bcachefs-kmod/Manifest
@@ -0,0 +1,2 @@
+DIST bcachefs-tools-1.37.4.tar.sign 833 BLAKE2B 0cec7399acf3f7efb44c746d032c557f40817dd8b09f4de01b541ac70a6c98375c6310f18b9223a0b7b9c18f45dedb2c57769d1285225969179be99631e5500f SHA512 e371ff6860db44f2490817cf498fa590402cc2cae3f7ee383e1dd556aed3443463f815b699880c38eb46c0bef04a9a5a13c0ecb9ec96f133a50a32a71eff1bfa
+DIST bcachefs-tools-1.37.4.tar.zst 1663281 BLAKE2B 6d1eabae9528d209979e10b742653e1e1a019141a6c0f0bbc5bb2b97c1faa9d4c8ca59b701617f6410926799f0b58ac5bd7f26ce3f9077e34adc4c8e07e32bb9 SHA512 48e030d31c9135399072b8ae408abdb9af43cf02b100a5f6019ee00d70db3ba02d94d0e3880d2394f79f72a5b2b57122ae58bb564218d1a7453783d1cd166eca
diff --git a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.37.4.ebuild b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.37.4.ebuild
new file mode 100644
index 0000000..4e57ea6
--- /dev/null
+++ b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.37.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+
+inherit linux-mod-r1 unpacker verify-sig
+
+MY_PN="bcachefs-tools"
+
+DESCRIPTION="Linux bcachefs kernel module for sys-fs/bcachefs-tools"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
+else
+	SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst"
+	SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="debug verify-sig"
+
+MODULES_KERNEL_MIN=6.16
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
+
+BDEPEND="
+	>=sys-kernel/linux-headers-6.16
+	verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 )
+"
+
+pkg_setup() {
+	# See https://github.com/koverstreet/bcachefs-tools/blob/master/libbcachefs/Kconfig
+	local CONFIG_CHECK="
+		BLOCK
+		EXPORTFS
+		CRC32
+		CRC64
+		FS_POSIX_ACL
+		LZ4_COMPRESS
+		LZ4_DECOMPRESS
+		LZ4HC_COMPRESS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+		ZSTD_COMPRESS
+		ZSTD_DECOMPRESS
+		CRYPTO_LIB_SHA256
+		CRYPTO_LIB_CHACHA
+		CRYPTO_LIB_POLY1305
+		KEYS
+		RAID6_PQ
+		XOR_BLOCKS
+		XXHASH
+		SYMBOLIC_ERRNAME
+	"
+	use debug && CONFIG_CHECK+="
+		DEBUG_INFO
+		FRAME_POINTER
+		!DEBUG_INFO_REDUCED
+	"
+	linux-mod-r1_pkg_setup
+}
+
+src_unpack() {
+	# Upstream signs the uncompressed tarball
+	if use verify-sig; then
+		einfo "Unpacking ${P}.tar.zst ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_PN}-${PV}.tar.sign \
+			< <(zstd -fdc "${DISTDIR}"/${MY_PN}-${PV}.tar.zst | tee >(tar -xf -))
+		assert "Unpack failed"
+	fi
+
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpacker ${MY_PN}-${PV}.tar.zst
+	fi
+
+}
+
+src_prepare() {
+	default
+
+	# Live builds will overwrite .version with git-describe output
+	echo "${PV}" > .version || die
+	emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
+}
+
+src_compile() {
+	local dirs=( "${WORKDIR}/module/src/${PN%-*}-"* )
+	local module_src="${dirs[0]}"
+
+	[[ -d "${module_src}" ]] || die
+
+	local modlist=( "bcachefs=:${module_src}:${module_src}/src/fs/bcachefs" )
+	local modargs=(
+		KDIR=${KV_OUT_DIR}
+	)
+
+	linux-mod-r1_src_compile
+}
diff --git a/sys-fs/bcachefs-kmod/metadata.xml b/sys-fs/bcachefs-kmod/metadata.xml
new file mode 100644
index 0000000..6c27585
--- /dev/null
+++ b/sys-fs/bcachefs-kmod/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alex@millerson.name</email>
+		<name>Alexander Miroshnichenko</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>falbrechtskirchinger@gmail.com</email>
+		<name>Florian Albrechtskirchinger</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">koverstreet/bcachefs-tools</remote-id>
+		<changelog>https://github.com/koverstreet/bcachefs-tools/blob/master/Changelog.mdwn</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index e3f937f..3769995 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -8,8 +8,8 @@ DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c5
 DIST anyhow-1.0.89.crate 47078 BLAKE2B fc824e72891bff0cc7aa3b538adfb9af7dc843ab6ed12b8b04eb70e62d32aae1decb9090621d3245dbe89841e73080d2d86973b4aee50873e798956da9b3faa6 SHA512 3c09317089ed78601a56c626700d12c0b49396e25fed9a9f05a2dbfbd6f91ad426c430633006a4043decd1f70a85c161c4f8dd7de0e4c00b82a169b89dda8da0
 DIST ascii-1.1.0.crate 36075 BLAKE2B 7e68e7b3d5e6aef132c52db8c078fdf2e70462d9238b637015d7964312737fc09b35719143ce1fbd3e5b8072c21717f33e5061adf4da1913a9b9f11ac9c453ec SHA512 d74982ad87796f0d745bfd654450dc74174fdc6aa2a0047e5d250f76dd6079189dc0f05d02a73a85b1d3a86c163524d1f43f5d014de0153cd69fad4de26cf0ec
 DIST autocfg-1.5.0.crate 18729 BLAKE2B 27580e39b366c6fca02c9db09997b6415c409f12068f1249184268bf96fd85ba659e25ec730f99e10caf452f96c486f3d7442bf09c4552b5f39519b21d6f88cc SHA512 f279856f234d39d369623576acf9546a1ca24d7fe449f36d4fb93ea75a7efaf2c4015b9616a69bbbed358c5e5882e16b045352f046aa4c049b3d13b1e8257b08
-DIST bcachefs-tools-1.37.3.tar.sign 833 BLAKE2B 1926e433f305c9e74f81ffab3cddedfeaa8999d737efeba2c18ebe54721daa7c00a36affbdac1521b076979fae14d87eb8d389a7bc7e140d26d0b5614bd6f087 SHA512 5081629ad456f14a34c80eabe3741db26eaf0457ed73e6a35f8e65bd8a41806d09fe8bb74714968e082458acac08824102fdf2675a0c2f1ac381133e85340251
-DIST bcachefs-tools-1.37.3.tar.zst 1659426 BLAKE2B 2fe69659f4c143d5a07aa71f25f1613de6dc9cf080cabaa6f76019d07bd9803ba6a41a2f30eba55b98b5f994d8bd1a63bd0734f26b4582c1614e3335daeb3876 SHA512 bb9316c9a5592105eca468a776b1f8e6e4fc36c08c0cdd0c82a5c6fa8bc6e62f729ebeab4584c9323d0cf117ce4e3ecd8457ee8354f3a28d84d4246db8cdedd8
+DIST bcachefs-tools-1.37.4.tar.sign 833 BLAKE2B 0cec7399acf3f7efb44c746d032c557f40817dd8b09f4de01b541ac70a6c98375c6310f18b9223a0b7b9c18f45dedb2c57769d1285225969179be99631e5500f SHA512 e371ff6860db44f2490817cf498fa590402cc2cae3f7ee383e1dd556aed3443463f815b699880c38eb46c0bef04a9a5a13c0ecb9ec96f133a50a32a71eff1bfa
+DIST bcachefs-tools-1.37.4.tar.zst 1663281 BLAKE2B 6d1eabae9528d209979e10b742653e1e1a019141a6c0f0bbc5bb2b97c1faa9d4c8ca59b701617f6410926799f0b58ac5bd7f26ce3f9077e34adc4c8e07e32bb9 SHA512 48e030d31c9135399072b8ae408abdb9af43cf02b100a5f6019ee00d70db3ba02d94d0e3880d2394f79f72a5b2b57122ae58bb564218d1a7453783d1cd166eca
 DIST bindgen-0.72.1.crate 246071 BLAKE2B b6db53ca86fa3b5f71abbf6d2fd5f83553e167507db2e869ed7f3acf8865478e49430eddce8c255a8fabf8f6e408e7dcc78a9088201cdeea1e48bc387f8a6f28 SHA512 14f4277b62cfc91661400ed1bacb82a9f28b7e6caa17dd4bb4dbeedd5784299d5915c2235af9da42a8a216fa0b14b49f1e38eaa530f1e906bcd74f864ae8a7e2
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.37.3.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.37.4.ebuild
similarity index 100%
rename from sys-fs/bcachefs-tools/bcachefs-tools-1.37.3.ebuild
rename to sys-fs/bcachefs-tools/bcachefs-tools-1.37.4.ebuild