diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index b317a4b14..7d1e46391 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -68,18 +68,18 @@ for i in /hurd/${hurd_fs}.static /hurd/exec ; do
   fi
 done
 
-if test -e '/hurd/acpi.static' ; then
-  acpi=true
-else
-  acpi=false
-fi
-
 if test -e '/hurd/pci-arbiter.static' ; then
   pci_arbiter=true
 else
   pci_arbiter=false
 fi
 
+if test -e '/hurd/acpi.static' ; then
+  acpi=true
+else
+  acpi=false
+fi
+
 if test -e '/hurd/rumpdisk.static' ; then
   rumpdisk=true
 else
@@ -159,26 +159,10 @@ EOF
 	echo		'$(echo "$message" | grub_quote)'
 EOF
 
-  if [ "$acpi" = true ] ; then
-    if [ "$pci_arbiter" = true ] ; then
-      next_task='${pci-task}'
-    elif [ "$rumpdisk" = true ] ; then
-      next_task='${disk-task}'
-    else
-      next_task='${fs-task}'
-    fi
-    sed "s/^/$submenu_indentation/" << EOF
-	module          /hurd/acpi.static acpi \\
-			$host_ports \\
-			--next-task='$next_task' \\
-			'\$(acpi-task=task-create)' $resume_task
-EOF
-    host_ports=""
-    resume_task=""
-  fi
-
   if [ "$pci_arbiter" = true ] ; then
-    if [ "$rumpdisk" = true ] ; then
+    if [ "$acpi" = true ] ; then
+      next_task='${acpi-task}'
+    elif [ "$rumpdisk" = true ] ; then
       next_task='${disk-task}'
     else
       next_task='${fs-task}'
@@ -193,6 +177,22 @@ EOF
     resume_task=""
   fi
 
+  if [ "$acpi" = true ] ; then
+    if [ "$rumpdisk" = true ] ; then
+      next_task='${disk-task}'
+    else
+      next_task='${fs-task}'
+    fi
+    sed "s/^/$submenu_indentation/" << EOF
+	module          /hurd/acpi.static acpi \\
+			$host_ports \\
+			--next-task='$next_task' \\
+			'\$(acpi-task=task-create)' $resume_task
+EOF
+    host_ports=""
+    resume_task=""
+  fi
+
   if [ "$rumpdisk" = true ] ; then
     sed "s/^/$submenu_indentation/" << EOF
 	module          /hurd/rumpdisk.static rumpdisk \\