diff --git a/srcpkgs/grub-x86_64-efi b/srcpkgs/grub-x86_64-efi
new file mode 120000
index 00000000000..2c8276e741a
--- /dev/null
+++ b/srcpkgs/grub-x86_64-efi
@@ -0,0 +1 @@
+grub
\ No newline at end of file
diff --git a/srcpkgs/grub/grub-x86_64-efi.template b/srcpkgs/grub/grub-x86_64-efi.template
new file mode 100644
index 00000000000..160bb57dbbe
--- /dev/null
+++ b/srcpkgs/grub/grub-x86_64-efi.template
@@ -0,0 +1,11 @@
+# Template file for 'grub-x86_64-efi'.
+#
+depends="grub>=$version dosfstools efibootmgr"
+short_desc="${short_desc} -- x86_64 EFI support"
+long_desc="${long_desc}
+
+ This package contains supports for x86_64 EFI booting."
+
+do_install() {
+	vmove usr/lib/grub/x86_64-efi usr/lib/grub
+}
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index a34aa473e88..d576e061696 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version="2.00"
-revision=4
+revision=5
 makedepends="flex libusb-compat-devel ncurses-devel freetype-devel
 liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
 fulldepends="os-prober"
@@ -18,7 +18,7 @@ long_desc="
  robust, more powerful, and more portable."
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="$makedepends dosfstools efibootmgr"
+	subpackages="grub-x86_64-efi"
 fi
 
 do_configure() {