diff --git a/core/grub/build b/core/grub/build
index 0fcd6b4b..7ade5684 100755
--- a/core/grub/build
+++ b/core/grub/build
@@ -8,7 +8,7 @@ export PYTHON=/bin/true
 # the Python tooling. The /bin/true above will create a
 # blank file, this prevents the blank file from overwriting
 # the existing one.
-sed -i 's/mv $@.new $@/:/g' grub/Makefile.in
+sed -i 's/mv $@.new $@/:/g' ./*/Makefile.in
 
 # Strip '-march' from 'CFLAGS' as per advice from upstream.
 # Fixes build fails on specific hardware.
@@ -19,7 +19,6 @@ CFLAGS=$(printf %s "$CFLAGS" | sed 's/-march=[^ ]*//g')
 pkg_dir=$1
 
 build_grub() (
-    cp -a grub "grub-${1##*=}"
     cd "grub-${1##*=}"
 
     ./configure \
diff --git a/core/grub/checksums b/core/grub/checksums
index 11c607c3..fbaa7cf6 100644
--- a/core/grub/checksums
+++ b/core/grub/checksums
@@ -1,2 +1,3 @@
 e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d  grub-2.04.tar.xz
+e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d  grub-2.04.tar.xz
 93cde7ed22280bf1bf205d1e2c9700c64d8d32bd759569f6e00913ec001389c5  grub.default
diff --git a/core/grub/sources b/core/grub/sources
index 3c08ed68..28ec6451 100644
--- a/core/grub/sources
+++ b/core/grub/sources
@@ -1,2 +1,3 @@
-https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz grub/
+https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz grub-pc
+https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz grub-efi
 files/grub.default