diff --git a/btrfs-progs-v5.11.tar.gz b/btrfs-progs-v5.11.tar.gz
deleted file mode 100644
index ad18998..0000000
--- a/btrfs-progs-v5.11.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fcb5d818968f17098db265c217281e3767861e6969d9d8f8855b2e321673f90e
-size 2713287
diff --git a/btrfs-progs-v5.12.tar.gz b/btrfs-progs-v5.12.tar.gz
new file mode 100644
index 0000000..2d93e5c
--- /dev/null
+++ b/btrfs-progs-v5.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f43298818dad790c88966935a352747283b30a57549c63d691c492da65f909af
+size 2727485
diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 2955c43..9f5bdb0 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Mon May 10 00:00:00 CEST 2021 - dsterba@suse.cz
+
+- Update to 5.12
+  * libbtrfsutil: relicensed to LGPL v2.1+
+  * mkfs: zoned mode support (kernel 5.12+)
+  * fi df: show zone_unusable per profile type in zoned mode
+  * fi usage: show total amount of zone_unusable
+  * fi resize: fix message for exact size
+  * image: fix warning and enlarge output file if necessary
+  * core
+    * refactor chunk allocator for more modes
+    * implement zoned mode support: allocation and writes, sb log
+    * crypto/hash refactoring and cleanups
+    * refactoring and cleanups
+  * other
+    * test updates
+    * CI updates
+      * travis-ci integration disabled
+      * docker images updated, more coverage
+    * incomplete build support for Android removed
+  * doc updates
+    * chattr mode m for 'NOCOMPRESS"
+    * swapfile used from fstab
+    * how to add a new export to libbtrfsutil
+    * update status of mount options since 5.9
+- Update to 5.11.1
+  * properly format checksums when a mismatch is reported
+  * check: fix false alert on tree block crossing 64K page boundary
+  * convert:
+    * refuse to convert filesystem with 'needs_recovery'
+    * update documentation to require fsck before conversion
+  * balance convert: fix raid56 warning when converting other profiles
+  * fi resize: improved summary
+  * other
+    * build: fix checks and autoconf defines
+    * fix symlink paths for CI support scripts
+    * updated tests
+
 -------------------------------------------------------------------
 Mon Mar  8 00:00:00 CET 2021 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index bbe15a7..f628fa1 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -34,7 +34,7 @@
 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut)
 
 Name:           btrfsprogs
-Version:        5.11
+Version:        5.12
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0-only
diff --git a/mkfs-default-features.patch b/mkfs-default-features.patch
index 2b5d9a5..9598d81 100644
--- a/mkfs-default-features.patch
+++ b/mkfs-default-features.patch
@@ -11,10 +11,10 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  utils.h |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: btrfs-progs-v4.10.2/fsfeatures.h
+Index: btrfs-progs-v5.12/common/fsfeatures.h
 ===================================================================
---- btrfs-progs-v4.10.2.orig/common/fsfeatures.h
-+++ btrfs-progs-v4.10.2/common/fsfeatures.h
+--- btrfs-progs-v5.12.orig/common/fsfeatures.h
++++ btrfs-progs-v5.12/common/fsfeatures.h
 @@ -19,10 +19,14 @@
  
  #include "kerncompat.h"
@@ -29,4 +29,4 @@ Index: btrfs-progs-v4.10.2/fsfeatures.h
 +#endif
  
  /*
-  * Avoid multi-device features (RAID56) and mixed block groups
+  * Avoid multi-device features (RAID56), mixed block groups, and zoned mode