diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3f11bb3384..dab65c7ca1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2742,7 +2742,7 @@ memoized as a function of '%current-system'."
 
 (define* (kernel-headers-boot0 #:optional (system (%current-system)))
   (match system
-    ("i586-gnu" hurd-core-headers-boot0)
+    ((? target-hurd?) hurd-core-headers-boot0)
     (_ linux-libre-headers-boot0)))
 
 (define texinfo-boot0