diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index d273908a0d9989147424209b1f572b7b1b62a0d3..8dffd45b71d408ad535d4f9e8db799ebffee2788 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=grub
 pkgver=2.12
-pkgrel=6
+pkgrel=7
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
@@ -49,6 +49,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
 	0005-Alpine-Linux-fixes-for-menu.patch
 	0006-build-force-no-pie.patch
 	0007-uefi-firmware-remove-fsetup-check.patch
+	Fix-grub-mkconfig-detection-of-xen.patch
 	"
 
 # secfixes:
@@ -262,4 +263,5 @@ d8606bc2fc6b34e683fdba8b2a131b7d5bede907556c141a30be1d7475a65bf5e2266d577f7a0f0d
 474f3576b45f612de4b157f951fbd334d7e136275dd2640e2d3deac7c813e4e8a8809a3b798476eb51cb0a3dd42b52583f7fe526fc78e7638f4506861c98a062  0005-Alpine-Linux-fixes-for-menu.patch
 bb792f7c7be99dee95a031e48be69698ec8e0e76a3060bff314922cca19f086525af6680fb3ea845949be85c7731659a7ab91b2b008e3d526d1549bb108053c2  0006-build-force-no-pie.patch
 c0bea923acc6affd32e78a58685e847f24e26c501b5bbabee99cc6e25c5668263e61f0bf508a6741bd75fef891ca3229f9d746ef254c72d2cb8dca7c18f92f54  0007-uefi-firmware-remove-fsetup-check.patch
+e3bbd225e67fc86bbd204f220fd47ec57ecd983cd5b7128b81ea138f5513f793230c556e1b702c99e2e903063c3e33ecd15cf923f6f22e3da980f830f3c0925d  Fix-grub-mkconfig-detection-of-xen.patch
 "
diff --git a/main/grub/Fix-grub-mkconfig-detection-of-xen.patch b/main/grub/Fix-grub-mkconfig-detection-of-xen.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ac88edfd82c720898177cc80008e23734fd0d137
--- /dev/null
+++ b/main/grub/Fix-grub-mkconfig-detection-of-xen.patch
@@ -0,0 +1,13 @@
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index 2f78bcf..5ea1bd3 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -187,7 +187,7 @@ for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+ 	version=$(echo $basename | sed -e "s,^[^-]*-,,g")
+ 	dirname=$(dirname $i)
+ 	config=
+-	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
++	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ${dirname}/config-[0-9]*-${version}; do
+ 	    if test -e "${j}" ; then
+ 		config="${j}"
+ 		break