diff --git a/debian/.git-dpm b/debian/.git-dpm
index c1b43a461..018864182 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-15983593f6792a2dffaa77ce1842f0fcbb694d50
-15983593f6792a2dffaa77ce1842f0fcbb694d50
+c50a3ed395c5a08bba44c8ade364650b901bc30b
+c50a3ed395c5a08bba44c8ade364650b901bc30b
 21f954425ffe2a934b6b26c0c948d340c91a16bb
 21f954425ffe2a934b6b26c0c948d340c91a16bb
 grub2_2.06.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index f4b156413..3404622db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ grub2 (2.06-1) UNRELEASED; urgency=medium
       manual checks for UEFI Secure Boot.
   * Cherry-pick from upstream:
     - fs/xfs: Fix unreadable filesystem with v4 superblock
+    - tests/ahci: Change "ide-drive" deprecated QEMU device name to "ide-hd"
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 18 Aug 2021 13:03:23 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0541cd280..748318a6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -58,3 +58,4 @@ debug_verifiers.patch
 mkimage-fix-section-sizes.patch
 tpm-unknown-error-non-fatal.patch
 xfs-fix-v4-superblock.patch
+tests-ahci-update-qemu-device-name.patch
diff --git a/debian/patches/tests-ahci-update-qemu-device-name.patch b/debian/patches/tests-ahci-update-qemu-device-name.patch
new file mode 100644
index 000000000..ee2a5fc59
--- /dev/null
+++ b/debian/patches/tests-ahci-update-qemu-device-name.patch
@@ -0,0 +1,34 @@
+From c50a3ed395c5a08bba44c8ade364650b901bc30b Mon Sep 17 00:00:00 2001
+From: Marius Bakke <marius@gnu.org>
+Date: Sun, 13 Jun 2021 15:11:51 +0200
+Subject: tests/ahci: Change "ide-drive" deprecated QEMU device name to
+ "ide-hd"
+
+The "ide-drive" device was removed in QEMU 6.0. The "ide-hd" has been
+available for more than 10 years now in QEMU. Thus there shouldn't be
+any need for backwards compatible names.
+
+Signed-off-by: Marius Bakke <marius@gnu.org>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=aaea244a6ddd1e35aed60a5c7a08ddc41f51805b
+Last-Update: 2021-09-24
+
+Patch-Name: tests-ahci-update-qemu-device-name.patch
+---
+ tests/ahci_test.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/ahci_test.in b/tests/ahci_test.in
+index 7df560462..d844fe680 100644
+--- a/tests/ahci_test.in
++++ b/tests/ahci_test.in
+@@ -41,7 +41,7 @@ echo "hello" > "$outfile"
+ 
+ tar cf "$imgfile" "$outfile"
+ 
+-if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
++if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
+    rm "$imgfile"
+    rm "$outfile"
+    exit 1
diff --git a/tests/ahci_test.in b/tests/ahci_test.in
index 7df560462..d844fe680 100644
--- a/tests/ahci_test.in
+++ b/tests/ahci_test.in
@@ -41,7 +41,7 @@ echo "hello" > "$outfile"
 
 tar cf "$imgfile" "$outfile"
 
-if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
+if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
    rm "$imgfile"
    rm "$outfile"
    exit 1