diff --git a/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch b/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch
index 3454264..997f569 100644
--- a/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch
+++ b/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch
@@ -1,4 +1,4 @@
-From 7f4e6125495f309190b8205c759d198228d8a7d6 Mon Sep 17 00:00:00 2001
+From 0b1c9ccf4c5808db323554c5d55ded2c345ebcb9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 28 Oct 2025 11:34:22 +0000
 Subject: [PATCH] convert: windows: Fix ESP conversion if C:\Windows\Temp has
@@ -20,7 +20,6 @@ and fixed the indentation.
 Fixes: https://issues.redhat.com/browse/RHEL-124569
 Reported-by: Ulhas Surse
 (cherry picked from commit 277ddd1a9b84d9c1b1fa93ef9a2e7f52b68d7930)
-(cherry picked from commit 0b1c9ccf4c5808db323554c5d55ded2c345ebcb9)
 ---
  convert/convert_windows.ml | 30 +++++++++++++++++-------------
  1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/0061-Update-common-submodule.patch b/0061-Update-common-submodule.patch
new file mode 100644
index 0000000..6848291
--- /dev/null
+++ b/0061-Update-common-submodule.patch
@@ -0,0 +1,34 @@
+From 7d1b42c8e3b0e8da9cfc881080ba9f7fb16b31fc Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 20 Sep 2025 17:20:25 +0100
+Subject: [PATCH] Update common submodule
+
+  Richard W.M. Jones (2):
+      daemon, generator: Use power of 2 for initial size of Hashtbl.create
+      mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor
+
+Fixes: https://issues.redhat.com/browse/RHEL-128772
+---
+ common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Submodule common b48c7d00..742c5f8b:
+diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
+index 7e46f318..07a91fc7 100644
+--- a/common/mlcustomize/inject_virtio_win.ml
++++ b/common/mlcustomize/inject_virtio_win.ml
+@@ -334,8 +334,13 @@ and ddb_regedits inspect drv_name drv_pciid =
+    * one must add keys into the DriverDatabase.
+    *)
+ 
++  let winarch =
++    match inspect.i_arch with
++    | "i386" -> "x86" | "x86_64" -> "amd64"
++    | _ -> assert false in
++
+   let drv_inf = "guestor.inf" in
+-  let drv_inf_label = drv_inf ^ "_tmp" in
++  let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in
+   let drv_config = "guestor_conf" in
+ 
+   [
diff --git a/copy-patches.sh b/copy-patches.sh
index 8b76a26..6c2d6a7 100755
--- a/copy-patches.sh
+++ b/copy-patches.sh
@@ -7,7 +7,7 @@ set -e
 #   ./copy-patches.sh
 
 project=virt-v2v
-rhel_version=9.7
+rhel_version=9.8
 
 # Check we're in the right directory.
 if [ ! -f $project.spec ]; then
diff --git a/virt-v2v.spec b/virt-v2v.spec
index ee24aef..29a8282 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -8,7 +8,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.7.1
-Release:       17%{?dist}
+Release:       18%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -88,6 +88,7 @@ Patch0057:     0057-Modify-configure_pnputil_install-script-to-check.patch
 Patch0058:     0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch
 Patch0059:     0059-remove-timeout-before-installing-virtio-win-drivers.patch
 Patch0060:     0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch
+Patch0061:     0061-Update-common-submodule.patch
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -391,6 +392,10 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check
 
 
 %changelog
+* Mon Nov 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-18
+- Fix pnputil driver store after conversion
+  resolves: RHEL-128772
+
 * Thu Oct 30 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-17
 - Fix ESP conversion if C:\Windows\Temp has alternate case
   resolves: RHEL-125117