diff --git a/manifest/armv7l/b/btrfs_progs.filelist b/manifest/armv7l/b/btrfs_progs.filelist
index 86d7186df..2facfe063 100644
--- a/manifest/armv7l/b/btrfs_progs.filelist
+++ b/manifest/armv7l/b/btrfs_progs.filelist
@@ -7,30 +7,27 @@
 /usr/local/bin/btrfstune
 /usr/local/bin/fsck.btrfs
 /usr/local/bin/mkfs.btrfs
-/usr/local/include/btrfs/btrfs-list.h
-/usr/local/include/btrfs/btrfsck.h
-/usr/local/include/btrfs/crc32c.h
 /usr/local/include/btrfs/ctree.h
-/usr/local/include/btrfs/extent-cache.h
-/usr/local/include/btrfs/extent_io.h
 /usr/local/include/btrfs/ioctl.h
 /usr/local/include/btrfs/kerncompat.h
 /usr/local/include/btrfs/list.h
-/usr/local/include/btrfs/radix-tree.h
-/usr/local/include/btrfs/raid56.h
 /usr/local/include/btrfs/rbtree.h
+/usr/local/include/btrfs/rbtree_types.h
 /usr/local/include/btrfs/send-stream.h
 /usr/local/include/btrfs/send-utils.h
 /usr/local/include/btrfs/send.h
-/usr/local/include/btrfs/sizes.h
 /usr/local/include/btrfs/version.h
 /usr/local/include/btrfsutil.h
 /usr/local/lib/libbtrfs.a
 /usr/local/lib/libbtrfs.so
 /usr/local/lib/libbtrfs.so.0
 /usr/local/lib/libbtrfs.so.0.1
+/usr/local/lib/libbtrfs.so.0.1.3
 /usr/local/lib/libbtrfsutil.a
 /usr/local/lib/libbtrfsutil.so
 /usr/local/lib/libbtrfsutil.so.1
-/usr/local/lib/libbtrfsutil.so.1.2.0
+/usr/local/lib/libbtrfsutil.so.1.3
+/usr/local/lib/libbtrfsutil.so.1.3.1
 /usr/local/lib/pkgconfig/libbtrfsutil.pc
+/usr/local/lib/udev/rules.d/64-btrfs-dm.rules
+/usr/local/lib/udev/rules.d/64-btrfs-zoned.rules
diff --git a/manifest/i686/b/btrfs_progs.filelist b/manifest/i686/b/btrfs_progs.filelist
index cb06bdc62..2facfe063 100644
--- a/manifest/i686/b/btrfs_progs.filelist
+++ b/manifest/i686/b/btrfs_progs.filelist
@@ -7,31 +7,27 @@
 /usr/local/bin/btrfstune
 /usr/local/bin/fsck.btrfs
 /usr/local/bin/mkfs.btrfs
-/usr/local/include/btrfs/btrfs-list.h
-/usr/local/include/btrfs/btrfsck.h
-/usr/local/include/btrfs/crc32c.h
 /usr/local/include/btrfs/ctree.h
-/usr/local/include/btrfs/extent-cache.h
-/usr/local/include/btrfs/extent_io.h
 /usr/local/include/btrfs/ioctl.h
 /usr/local/include/btrfs/kerncompat.h
 /usr/local/include/btrfs/list.h
-/usr/local/include/btrfs/radix-tree.h
-/usr/local/include/btrfs/raid56.h
 /usr/local/include/btrfs/rbtree.h
+/usr/local/include/btrfs/rbtree_types.h
 /usr/local/include/btrfs/send-stream.h
 /usr/local/include/btrfs/send-utils.h
 /usr/local/include/btrfs/send.h
-/usr/local/include/btrfs/sizes.h
 /usr/local/include/btrfs/version.h
 /usr/local/include/btrfsutil.h
 /usr/local/lib/libbtrfs.a
 /usr/local/lib/libbtrfs.so
 /usr/local/lib/libbtrfs.so.0
 /usr/local/lib/libbtrfs.so.0.1
+/usr/local/lib/libbtrfs.so.0.1.3
 /usr/local/lib/libbtrfsutil.a
 /usr/local/lib/libbtrfsutil.so
 /usr/local/lib/libbtrfsutil.so.1
-/usr/local/lib/libbtrfsutil.so.1.2.0
+/usr/local/lib/libbtrfsutil.so.1.3
+/usr/local/lib/libbtrfsutil.so.1.3.1
 /usr/local/lib/pkgconfig/libbtrfsutil.pc
 /usr/local/lib/udev/rules.d/64-btrfs-dm.rules
+/usr/local/lib/udev/rules.d/64-btrfs-zoned.rules
diff --git a/manifest/x86_64/b/btrfs_progs.filelist b/manifest/x86_64/b/btrfs_progs.filelist
index df0a77f88..be3300d77 100644
--- a/manifest/x86_64/b/btrfs_progs.filelist
+++ b/manifest/x86_64/b/btrfs_progs.filelist
@@ -7,31 +7,27 @@
 /usr/local/bin/btrfstune
 /usr/local/bin/fsck.btrfs
 /usr/local/bin/mkfs.btrfs
-/usr/local/include/btrfs/btrfs-list.h
-/usr/local/include/btrfs/btrfsck.h
-/usr/local/include/btrfs/crc32c.h
 /usr/local/include/btrfs/ctree.h
-/usr/local/include/btrfs/extent-cache.h
-/usr/local/include/btrfs/extent_io.h
 /usr/local/include/btrfs/ioctl.h
 /usr/local/include/btrfs/kerncompat.h
 /usr/local/include/btrfs/list.h
-/usr/local/include/btrfs/radix-tree.h
-/usr/local/include/btrfs/raid56.h
 /usr/local/include/btrfs/rbtree.h
+/usr/local/include/btrfs/rbtree_types.h
 /usr/local/include/btrfs/send-stream.h
 /usr/local/include/btrfs/send-utils.h
 /usr/local/include/btrfs/send.h
-/usr/local/include/btrfs/sizes.h
 /usr/local/include/btrfs/version.h
 /usr/local/include/btrfsutil.h
 /usr/local/lib64/libbtrfs.a
 /usr/local/lib64/libbtrfs.so
 /usr/local/lib64/libbtrfs.so.0
 /usr/local/lib64/libbtrfs.so.0.1
+/usr/local/lib64/libbtrfs.so.0.1.3
 /usr/local/lib64/libbtrfsutil.a
 /usr/local/lib64/libbtrfsutil.so
 /usr/local/lib64/libbtrfsutil.so.1
-/usr/local/lib64/libbtrfsutil.so.1.2.0
+/usr/local/lib64/libbtrfsutil.so.1.3
+/usr/local/lib64/libbtrfsutil.so.1.3.1
 /usr/local/lib64/pkgconfig/libbtrfsutil.pc
 /usr/local/lib64/udev/rules.d/64-btrfs-dm.rules
+/usr/local/lib64/udev/rules.d/64-btrfs-zoned.rules
diff --git a/packages/btrfs_progs.rb b/packages/btrfs_progs.rb
index 49994101d..b4cb0e88d 100644
--- a/packages/btrfs_progs.rb
+++ b/packages/btrfs_progs.rb
@@ -1,23 +1,24 @@
-require 'package'
+require 'buildsystems/autotools'
 
-class Btrfs_progs < Package
+class Btrfs_progs < Autotools
   description 'BTRFS is a modern copy on write filesystem for Linux aimed at implementing advanced features while also focusing on fault tolerance, repair and easy administration.'
   homepage 'https://btrfs.wiki.kernel.org/index.php/Main_Page'
-  version '6.1.2'
+  version '6.9'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'https://github.com/kdave/btrfs-progs/archive/v5.10.1.tar.gz'
-  source_sha256 '69788461f7076951f7235b87d0a5615683151dfbfaaa93f645279bf757e85769'
+  source_url 'https://github.com/kdave/btrfs-progs.git'
+  git_hashtag "v#{version}"
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '30b25d3fa711ffe7a814c779831d81a2330fbfa8d7c755f4e4ae2d7a285a9de2',
-     armv7l: '30b25d3fa711ffe7a814c779831d81a2330fbfa8d7c755f4e4ae2d7a285a9de2',
-       i686: 'bd46556e6758de9cb7e21e012e81582c65448be3140130b41c24df876886e9b9',
-     x86_64: '67b69603e47c96060fbbf3d0e009cd42ed811d345ddad365d82fb41b241b4750'
+    aarch64: 'b82e35f3745ec1d31ae24c99d9a1abd46830c576106280810cc0035ed23b181b',
+     armv7l: 'b82e35f3745ec1d31ae24c99d9a1abd46830c576106280810cc0035ed23b181b',
+       i686: 'bc6641ab32514d25078506a97456ab0556fb0b109f2874e138940cab57cc14b4',
+     x86_64: '5de03dcbd63e8741b54552cb2568766e7884eec1838cf4d52d2bf527bf5db790'
   })
 
   depends_on 'e2fsprogs'
+  depends_on 'eudev' # R
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'libgcrypt' # R
@@ -26,17 +27,8 @@ class Btrfs_progs < Package
   depends_on 'zlibpkg' # R
   depends_on 'zstd' # R
 
-  def self.build
-    system './autogen.sh'
-    system "./configure #{CREW_OPTIONS} \
-            --disable-documentation \
-            --disable-convert \
-            --with-crypto=libgcrypt \
-            --with-convert=ext2"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  configure_options '--disable-documentation \
+    --disable-convert \
+    --with-crypto=libgcrypt \
+    --with-convert=ext2'
 end