diff --git a/sys-fs/bcachefs-kmod/Manifest b/sys-fs/bcachefs-kmod/Manifest
index 13482c6..b99396b 100644
--- a/sys-fs/bcachefs-kmod/Manifest
+++ b/sys-fs/bcachefs-kmod/Manifest
@@ -1,2 +1,2 @@
-DIST bcachefs-tools-1.31.5.tar.sign 833 BLAKE2B 05d00a24c934e9196350c0080fd00e2226eec412c27da930194c6b4080209a7cafacd671ffb08192b992a82a35295cb5a253bac6ba7d924b06a2ffd3ffd49249 SHA512 8e99bfffa1ed24f861ba64137f20aeb3d4ad553641c558ab16460c304525462062cd995bdc7528867820f8079efd913f295ad2956adcae17b0b90f20835d6ff7
-DIST bcachefs-tools-1.31.5.tar.zst 1333803 BLAKE2B 106e611f37889976cd24926f5f3f59582f0c79e22013569c12f5851eeae6089ef9d06c5f48b5414dc270bcfe55d36c20d650ce8ec9112be9d360f2f0b09a6245 SHA512 d53679ccfcc44975aab2d6cda82b82c64300f28a1d3a48ab4d6165118222a8db97b53531743aa4f0d78d380261279515118bba8b7ecfd4f963e74f217302107c
+DIST bcachefs-tools-1.31.6.tar.sign 833 BLAKE2B 83665ba3741145746fe3d378d30ad4aa9309c5e800f86f5ba0563a5112638f0b6c894db59182bfdc49b2ddb4e1582047807318498e5837015fd36e2ec60cc48a SHA512 55932297d8fae7059f5683ae00eb2892bc09a606c13809df1b4e0dbf8e0dcfb907d8901dfe40d81efb2fb233613253ef7cd5c1e6c4456a29e64650e473e1510f
+DIST bcachefs-tools-1.31.6.tar.zst 1334832 BLAKE2B 8eb27490601c59cefac7114740dfcce6e74afceded86509beffed37998535bc084b554074ee156af5eda29210488ecd36bba3800b6e945d4baa78ca6bcb23482 SHA512 41d02c03efb52436165d4dae8441450f46477371f83b6a8c01e67c74a7585e3992cb38f4d7a7afa8e10058b17b32641f5cfd2e0144571650c893b483d5939047
diff --git a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.5.ebuild b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.6.ebuild
similarity index 68%
rename from sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.5.ebuild
rename to sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.6.ebuild
index 534cad2..1cfdfc7 100644
--- a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.5.ebuild
+++ b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.6.ebuild
@@ -23,11 +23,14 @@ else
 	KEYWORDS="~amd64 ~arm64"
 fi
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="GPL-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
-IUSE="debug +rootfs verify-sig"
+
+IUSE="debug verify-sig"
 
 DEPEND="~sys-fs/bcachefs-tools-${PV}"
 
@@ -37,53 +40,42 @@ RDEPEND="${DEPEND}
 BDEPEND=">=sys-kernel/linux-headers-6.16
 	verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 )
 "
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_pretend() {
-        use rootfs || return 0
-}
-
 pkg_setup() {
-    local CONFIG_CHECK="
-            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
+	local CONFIG_CHECK="
+		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
 	"
-    use debug && CONFIG_CHECK+="
-            DEBUG_INFO
-            FRAME_POINTER
-            !DEBUG_INFO_REDUCED
-    "
-    use rootfs && CONFIG_CHECK+="
-            BLK_DEV_INITRD
-            DEVTMPFS
-    "
 	linux-mod-r1_pkg_setup
 }
 
@@ -117,14 +109,14 @@ src_prepare() {
 
 	emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
 	sed -i "s|^#define TRACE_INCLUDE_PATH .*|#define TRACE_INCLUDE_PATH ${WORKDIR}/${MODULE_S}/src/fs/bcachefs|" \
-	  ../${MODULE_S}/src/fs/bcachefs/trace.h || die
+		../${MODULE_S}/src/fs/bcachefs/trace.h || die
 	sed -i '/mean_and_variance_test.o/Id' ../${MODULE_S}/src/fs/bcachefs/Makefile|| die
 }
 
 src_compile() {
 	local modlist=( "bcachefs=kernel/fs/bcachefs:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" )
 	local modargs=(
-	        KDIR=${KV_OUT_DIR}
+		KDIR=${KV_OUT_DIR}
 	)
 
 	linux-mod-r1_src_compile