diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index bee7000b956..f885adc2b5a 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.06
-pkgrel=14
+pkgrel=15
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
@@ -38,6 +38,7 @@ for f in $flavors; do
 done
 
 source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
+	update-grub
 	grub-xen-host_grub.cfg
 
 	0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
@@ -216,6 +217,8 @@ package() {
 
 	mkdir -p "$pkgdir"/usr/share/bash-completion
 	mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
+
+	install -D -m755 "$srcdir"/update-grub "$pkgdir"/usr/sbin/update-grub
 }
 
 bios() {
@@ -286,6 +289,7 @@ bashcomp() {
 
 sha512sums="
 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe  grub-2.06.tar.xz
+85b3c56670fb0aaaf831cc6d7ca45faeb68b844cb17cfd6f9b51c2473f0b153cfa7b26ff8bf00a88b2ed3e0ae69a1e8f735256e6cecc91e959169606e2abf887  update-grub
 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4  grub-xen-host_grub.cfg
 377ecb3203bc19c792c3299cec5e678a8765b552a020e0f8cf29f881a9ed936fd00fb1eddde835daf98d9450078f5ab3a0236b6a6a8cd1ffc204e80739c7dc27  0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
 73dfe930925554cd750b37cb386e98f9b9ae0ccfde7d6edfda201e7a723173314523123fbd1aedaa83cf3649fc28550649a21709705b3a62b5d90914f58587c6  0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
diff --git a/main/grub/grub.trigger b/main/grub/grub.trigger
index 740dfcb813c..edc2de42fd7 100644
--- a/main/grub/grub.trigger
+++ b/main/grub/grub.trigger
@@ -1,8 +1,7 @@
 #!/bin/sh
-if [ -e /boot/grub/grub.cfg ]; then
-	cp /boot/grub/grub.cfg /boot/grub/grub.cfg.backup
-fi
-mkdir -p /boot/grub
-grub-mkconfig -o /boot/grub/grub.cfg.new \
-	&& mv /boot/grub/grub.cfg.new /boot/grub/grub.cfg
 
+if grep -q '^disable_trigger=1' /etc/update-grub.conf 2>/dev/null; then
+	exit 0
+fi
+
+exec /usr/sbin/update-grub
diff --git a/main/grub/update-grub b/main/grub/update-grub
new file mode 100644
index 00000000000..77dadd14e5c
--- /dev/null
+++ b/main/grub/update-grub
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -e /boot/grub/grub.cfg ]; then
+	cp /boot/grub/grub.cfg /boot/grub/grub.cfg.backup
+fi
+mkdir -p /boot/grub
+grub-mkconfig -o /boot/grub/grub.cfg.new \
+	&& mv /boot/grub/grub.cfg.new /boot/grub/grub.cfg
+