diff --git a/0020-thin_repair-thin_dump-Exclude-unwanted-btree-nodes.patch b/0020-thin_repair-thin_dump-Exclude-unwanted-btree-nodes.patch
new file mode 100644
index 0000000..7ac881f
--- /dev/null
+++ b/0020-thin_repair-thin_dump-Exclude-unwanted-btree-nodes.patch
@@ -0,0 +1,25 @@
+From 54ea2ba0098a5fbacf0b8f4fc5f9e4aa13e4b743 Mon Sep 17 00:00:00 2001
+From: Ming-Hung Tsai <mtsai@redhat.com>
+Date: Tue, 24 Aug 2021 20:59:47 +0800
+Subject: [PATCH] [thin_repair/thin_dump] Exclude unwanted btree nodes
+
+---
+ thin-provisioning/metadata_dumper.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/thin-provisioning/metadata_dumper.cc b/thin-provisioning/metadata_dumper.cc
+index 0ca4afed..ffdeb04c 100644
+--- a/thin-provisioning/metadata_dumper.cc
++++ b/thin-provisioning/metadata_dumper.cc
+@@ -597,6 +597,8 @@ namespace {
+ 
+ 					info.nr_mappings = n.get_nr_entries();
+ 				}
++			} else {
++				fail(info, "not the value size of interest");
+ 			}
+ 
+ 			return info;
+-- 
+2.34.3
+
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index 595bcc5..1ef7ca2 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -8,7 +8,7 @@
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
 Version: 0.9.0
-Release: 12%{?dist}%{?release_suffix}
+Release: 13%{?dist}%{?release_suffix}
 License: GPLv3+
 URL: https://github.com/jthornber/thin-provisioning-tools
 #Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-%%{version}.tar.gz
@@ -38,6 +38,8 @@ Patch18: 0017-thin_repair-thin_dump-Change-the-label-type-for-empt.patch
 Patch19: 0018-thin_repair-thin_dump-Check-consistency-of-thin_ids-.patch
 # BZ 2030679:
 Patch20: 0019-thin_check-Allow-using-clear-needs-check-and-skip-ma.patch
+# BZ 2091624:
+Patch21: 0020-thin_repair-thin_dump-Exclude-unwanted-btree-nodes.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel, gcc-c++
 Requires: expat
@@ -98,6 +100,7 @@ END
 %patch18 -p1 -b .backup18
 %patch19 -p1 -b .backup19
 %patch20 -p1 -b .backup20
+%patch21 -p1 -b .backup21
 echo %{version}-%{release} > VERSION
 
 %if 0%{?rhel}
@@ -174,6 +177,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install-rust-tools
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
+* Wed Jun 22 2022 Marian Csontos <mcsontos@redhat.com> - 0.9.0-13
+- Improve duration of thin_repair on very large metadata devices.
+
 * Fri Dec 10 2021 Marian Csontos <mcsontos@redhat.com> - 0.9.0-12
 - Allows --clear-needs-check with --super-block-only or --skip-mappings.