diff --git a/srcpkgs/bcachefs-tools/patches/make.patch b/srcpkgs/bcachefs-tools/patches/make.patch
index 760b6443612..cfe1961c3a5 100644
--- a/srcpkgs/bcachefs-tools/patches/make.patch
+++ b/srcpkgs/bcachefs-tools/patches/make.patch
@@ -9,6 +9,14 @@
  CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
  
  CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS)
+@@ -73,7 +73,6 @@
+ CFLAGS+=$(call cc-disable-warning, shift-overflow)
+ CFLAGS+=$(call cc-disable-warning, enum-conversion)
+ CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end)
+-export RUSTFLAGS=-C default-linker-libraries
+ 
+ PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils"
+ ifdef BCACHEFS_FUSE
 --- a/Makefile
 +++ b/Makefile
 @@ -200,7 +200,7 @@
diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template
index 9877daa491b..f3471bb9270 100644
--- a/srcpkgs/bcachefs-tools/template
+++ b/srcpkgs/bcachefs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'bcachefs-tools'
 pkgname=bcachefs-tools
 reverts="24_1"
-version=1.13.0
+version=1.20.0
 revision=1
 build_style=gnu-makefile
 make_install_args="ROOT_SBINDIR=/usr/bin"
@@ -15,12 +15,15 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://bcachefs.org/"
 distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz"
-checksum=cc7196505eba3a71e2ab8b9d0d19c6b16959b15aeb6e57e696dc14bd735ee0d5
+checksum=e616fea8bbd26581fb614fef9e50432a55a30248d7c42823cc06fee9e0d38747
 
 export VERSION=v${version}
 export RUST_TARGET
 
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	broken="bch_bindgen: E0588"
+fi
+
 pre_build() {
-	# fuck me sideways why this is necessary, it should be default
 	RUSTFLAGS+=" -C linker=$CC"
 }