diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
index 29228e4..73bee6d 100644
--- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
@@ -1,4 +1,4 @@
-From 170691bd25cc00cd0c341057ca780d99e9150a2a Mon Sep 17 00:00:00 2001
+From fd68a9dc94c54ecc1e7853bfc90220424bd5c4ca Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 28 Sep 2014 19:14:43 +0100
 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode
diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
index ed230c3..a5f1078 100644
--- a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+++ b/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
@@ -1,4 +1,4 @@
-From d053640fad8704f74077c4b1f563e8607d5b9e39 Mon Sep 17 00:00:00 2001
+From 21fecd276d0a6aaa4ea8a75fc8b77a3593001492 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Sep 2014 10:50:27 +0100
 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option
diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
index ead562a..1623437 100644
--- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
@@ -1,4 +1,4 @@
-From 6552310e58e3cf9eb517b8a5665815d953e3efa2 Mon Sep 17 00:00:00 2001
+From 41b609f89872d44ae9fdaf30a141132759efae22 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Apr 2015 09:45:41 -0400
 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu
diff --git a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch b/0004-RHEL-Fixes-for-libguestfs-winsupport.patch
index 275aeb7..56eb11e 100644
--- a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch
+++ b/0004-RHEL-Fixes-for-libguestfs-winsupport.patch
@@ -1,4 +1,4 @@
-From 91c1d9bbad617ec63d570a0cfc3e5c629cf15f92 Mon Sep 17 00:00:00 2001
+From def0df3659baaf52a68d23a9d8f86f9bd4c7f68e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 30 Aug 2015 03:21:57 -0400
 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.
diff --git a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
index 92d1de0..5cef3ff 100644
--- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+++ b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
@@ -1,4 +1,4 @@
-From 8b00d9f0187d782f68ceeaf382bf1edc39c47dac Mon Sep 17 00:00:00 2001
+From 869d6333dc9f27f4398df6f8d98ddc13191e4be9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)
diff --git a/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
index 4d6872e..de5616d 100644
--- a/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+++ b/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
@@ -1,4 +1,4 @@
-From 3aa84da24f500bba3fd367395c99c78edbaecd86 Mon Sep 17 00:00:00 2001
+From 0695b6734db3e57954ec7b97b63bcc91d4f72b37 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)
diff --git a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
index 2da8c68..aad0e41 100644
--- a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+++ b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
@@ -1,4 +1,4 @@
-From 941b2b5e1e14320f923f474ce3e7434f80d5a2c9 Mon Sep 17 00:00:00 2001
+From ef2fd3cbbf3261c6bf43ec35425f3552f6eb918d Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests
diff --git a/0008-RHEL-Disable-o-glance.patch b/0008-RHEL-Disable-o-glance.patch
index dd89d4c..2a87c85 100644
--- a/0008-RHEL-Disable-o-glance.patch
+++ b/0008-RHEL-Disable-o-glance.patch
@@ -1,4 +1,4 @@
-From 5699dad4751848b7230e21d26dce93053e55538e Mon Sep 17 00:00:00 2001
+From e9890240ed9e0a0b967987f516c4bc9d2406ea7f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 30 Jun 2021 11:15:52 +0100
 Subject: [PATCH] RHEL: Disable -o glance
diff --git a/0009-RHEL-Remove-the-in-place-option.patch b/0009-RHEL-Remove-the-in-place-option.patch
index 12c5b0c..aea6ba0 100644
--- a/0009-RHEL-Remove-the-in-place-option.patch
+++ b/0009-RHEL-Remove-the-in-place-option.patch
@@ -1,4 +1,4 @@
-From f534c095598a0802e6ccec7a3ae6c043e2ce76fa Mon Sep 17 00:00:00 2001
+From 16f78a6852d4d6c00b2d987dac40d8ea18b7f192 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option
diff --git a/0010-output-Remove-o-json-mode.patch b/0010-output-Remove-o-json-mode.patch
index 75f607d..61efb9d 100644
--- a/0010-output-Remove-o-json-mode.patch
+++ b/0010-output-Remove-o-json-mode.patch
@@ -1,4 +1,4 @@
-From 86a6532b2411ac652299058095ca9014239d2401 Mon Sep 17 00:00:00 2001
+From 13e570e2c19319e4164bba7de479980ebff74fdb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 11 Apr 2022 11:01:46 +0100
 Subject: [PATCH] output: Remove -o json mode
diff --git a/0011-output-Remove-unused-dummy.c.patch b/0011-output-Remove-unused-dummy.c.patch
index 9a23f8f..1779921 100644
--- a/0011-output-Remove-unused-dummy.c.patch
+++ b/0011-output-Remove-unused-dummy.c.patch
@@ -1,4 +1,4 @@
-From 8c122a68329f00ebd9db370d48780618b9e3af1e Mon Sep 17 00:00:00 2001
+From 0c52088cbcfe4f00794f070866e806179abc7596 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 12 Apr 2022 11:53:45 +0100
 Subject: [PATCH] output: Remove unused dummy.c
diff --git a/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch b/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
index 5b6feea..31baba6 100644
--- a/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
+++ b/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
@@ -1,4 +1,4 @@
-From 5d976b2bcddff8e074895f12ed7abbdf5b4202df Mon Sep 17 00:00:00 2001
+From b3398f6e90056ac0e38bd0a9751e7aca4316555e Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Tue, 10 May 2022 12:53:07 +0200
 Subject: [PATCH] adopt inversion of SELinux relabeling in virt-customize
diff --git a/sources b/sources
index 892a208..f630acb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.0.5.tar.gz) = 83de83060cd35210497c1751287d68ccb472b1dcbce0634fb96b1f9bfcd59b81f783578fd5799ab721d4e978e677b9a30349b34cc4a414b381e7ab98180b92de
-SHA512 (virt-v2v-2.0.5.tar.gz.sig) = 55ca5774f3929605b528f2d4969eec6bf08278724494cbe169f352e45f5148842bbda7f7e586412a00a2cc3da50bc7f5f6306aeeee58cc550f78d4fb3e410279
+SHA512 (virt-v2v-2.0.6.tar.gz) = 8be0b74344331ccb8f777ba0c13f19b5070ab8106e70dbe3c1963c880b5bfe980e5333b1a6369bc2f4d27a47d0a18b99d91845e8d8c68da775ac3d009c494fc0
+SHA512 (virt-v2v-2.0.6.tar.gz.sig) = 01e96bae7bc11763756b4ebfce2f1876593cdd6aa2e438ea73880b76f4ba1bf3c47482b45b44147bf180620bc1f288ca05cfaa7bf09165b3f766f06483dd658e
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 2fa05a5..3127c66 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -15,7 +15,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.0.5
+Version:       2.0.6
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -318,8 +318,8 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 
 
 %changelog
-* Thu May 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.5-1
-- Rebase to stable branch version 2.0.5
+* Thu May 26 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.6-1
+- Rebase to stable branch version 2.0.6
   resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
 - Fix openssh-clients dependency
   resolves: rhbz#2064178
@@ -350,6 +350,12 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
   resolves: rhbz#2076013
 - Fix -o qemu warning
   resolves: rhbz#2082603
+- If listing RPM applications fails, rebuild DB and retry (2089623)
+- Document -i vmx -it ssh percent encoding in ssh URIs
+  resolves: rhbz#1938954
+- Document extra permissions needed for VMware 7 (1817050)
+- Remove osprober devices left around by grub2
+  resolves: rhbz#2003503
 
 * Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.99-1
 - Rebase to upstream 1.45.99.