diff --git a/srcpkgs/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch b/srcpkgs/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch
deleted file mode 100644
index 7f79ab41553..00000000000
--- a/srcpkgs/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/convert/source-ext2.c b/convert/source-ext2.c
-index b1492c78693d..070126ec38ec 100644
---- convert/source-ext2.c
-+++ convert/source-ext2.c
-@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
- {
- 	size_t value_size = entry->e_value_size;
- 
--	if (entry->e_value_block != 0 || value_size > size ||
--	    entry->e_value_offs + value_size > size)
-+	if (value_size > size || entry->e_value_offs + value_size > size)
- 		return -EIO;
- 	return 0;
- }
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ba065a3cb75..ed1c0c32974 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,25 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=4.15.1
-revision=2
+version=4.16
+revision=1
 wrksrc=${pkgname}-v${version}
 build_style=gnu-configure
 configure_args="--disable-backtrace"
-hostmakedepends="asciidoc automake libtool pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
+hostmakedepends="asciidoc automake libtool pkg-config python3-setuptools xmlto"
+makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel python3-devel"
 checkdepends="acl-progs e2fsprogs util-linux"
 short_desc="Btrfs filesystem utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2.0-only"
+license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="http://btrfs.wiki.kernel.org/"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=67102ac0d6795f368acc94efaca29b6626d972638790a4a0c9f89a27cd543f96
+checksum=f3e0ec4864b7b89db1a6a36fa48bf8a9217117714a04b13c84d0fea1eac154b2
 make_check_target="test"
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3-devel"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
@@ -41,17 +45,35 @@ post_install() {
 }
 
 libbtrfs_package() {
-	short_desc+=" - runtime library"
+	short_desc+=" - btrfs library"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/libbtrfs.so.*"
 	}
 }
+
 libbtrfs-devel_package() {
-	short_desc+=" - development files"
+	short_desc+=" - libbtrfs development files"
 	depends="libbtrfs>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove usr/include/btrfs
+		vmove usr/lib/libbtrfs.a
+		vmove usr/lib/libbtrfs.so
+	}
+}
+
+libbtrfsutil_package() {
+	short_desc+=" - btrfsutil library"
+	pkg_install() {
+		vmove "usr/lib/libbtrfsutil.so.*"
+	}
+}
+
+libbtrfsutil-devel_package() {
+	depends="libbtrfsutil-${version}_${revision}"
+	short_desc+=" - libbtrfsutil development files"
+	pkg_install() {
+		vmove usr/include/btrfsutil.h
+		vmove usr/lib/libbtrfsutil.a
+		vmove usr/lib/libbtrfsutil.so
 	}
 }
diff --git a/srcpkgs/libbtrfsutil b/srcpkgs/libbtrfsutil
new file mode 120000
index 00000000000..03c99214340
--- /dev/null
+++ b/srcpkgs/libbtrfsutil
@@ -0,0 +1 @@
+btrfs-progs
\ No newline at end of file
diff --git a/srcpkgs/libbtrfsutil-devel b/srcpkgs/libbtrfsutil-devel
new file mode 120000
index 00000000000..03c99214340
--- /dev/null
+++ b/srcpkgs/libbtrfsutil-devel
@@ -0,0 +1 @@
+btrfs-progs
\ No newline at end of file