diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.31.13.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.31.13-r1.ebuild
similarity index 76%
rename from sys-fs/bcachefs-tools/bcachefs-tools-1.31.13.ebuild
rename to sys-fs/bcachefs-tools/bcachefs-tools-1.31.13-r1.ebuild
index c450988..05db83d 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.31.13.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.31.13-r1.ebuild
@@ -86,13 +86,16 @@ CRATES="
 	zeroize@1.8.1
 	zeroize_derive@1.4.2
 "
-
+MODULES_KERNEL_MIN=6.16
+MODULES_INITRAMFS_IUSE=+initramfs
+MODULES_OPTIONAL_IUSE="modules"
+MODULE_S="module/src/${PN%-*}-${PV}"
 LLVM_COMPAT=( {17..21} )
 PYTHON_COMPAT=( python3_{11..14} )
 RUST_MIN_VER="1.77.0"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
 
-inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs udev unpacker verify-sig
+inherit cargo flag-o-matic linux-mod-r1 llvm-r1 python-any-r1 shell-completion toolchain-funcs udev unpacker verify-sig
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -128,7 +131,8 @@ DEPEND="
 	fuse? ( >=sys-fs/fuse-3.7.0 )
 "
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	modules? ( !sys-fs/bcachefs-kmod )"
 
 # Clang is required for bindgen
 BDEPEND="
@@ -155,6 +159,46 @@ pkg_setup() {
 	rust_pkg_setup
 	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use modules ; then
+		local CONFIG_CHECK="				
+		        !BCACHEFS_FS
+		        BLOCK
+		        CRC_OPTIMIZATIONS
+		        EXPORTFS
+		        CLOSURES
+		        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
+		        MIN_HEAP
+		        XARRAY_MULTI
+		"
+		use amd64 && CONFIG_CHECK+="
+		        CRYPTO_CHACHA20_X86_64
+		        CRYPTO_POLY1305_X86_64
+		"
+		use debug && CONFIG_CHECK+="
+		        DEBUG_INFO
+		        FRAME_POINTER
+		        !DEBUG_INFO_REDUCED
+		"
+		linux-mod-r1_pkg_setup
+	fi
 }
 
 src_unpack() {
@@ -186,6 +230,10 @@ src_prepare() {
 		-e '/^CFLAGS/s:-g::' \
 		-i Makefile || die
 	append-lfs-flags
+
+	if use modules ; then
+		emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
+	fi
 }
 
 src_compile() {
@@ -204,6 +252,15 @@ src_compile() {
 	for shell in bash fish zsh; do
 		./bcachefs completions ${shell} > ${shell}.completion || die
 	done
+
+	if use modules ; then
+		local modlist=( "bcachefs=:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" )
+		local modargs=(
+			KDIR=${KV_OUT_DIR}
+		)
+
+		linux-mod-r1_src_compile
+	fi
 }
 
 src_install() {
@@ -222,6 +279,10 @@ src_install() {
 		dosym bcachefs /sbin/mount.fuse.bcachefs
 	fi
 
+	if use modules ; then
+		linux-mod-r1_src_install
+	fi
+
 	newbashcomp bash.completion bcachefs
 	newfishcomp fish.completion bcachefs.fish
 	newzshcomp zsh.completion _bcachefs
@@ -232,6 +293,10 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 
+	if use modules ; then
+		linux-mod-r1_pkg_postinst
+	fi
+
 	if use fuse; then
 		ewarn "FUSE support is experimental."
 		ewarn "Please only use it for development purposes at the risk of losing your data."