diff --git a/Makefile b/Makefile
index 1d75f733786077fee36b530a6698f07924c37761..32b901bc3c557146d86b3e9560ad96c81d41ff34 100644
--- a/Makefile
+++ b/Makefile
@@ -395,7 +395,7 @@ $(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi $(GRUB_ASSEMBLE_DIR)/grub.i386-efi : $(GRUB
 image_grub_mkimage_mbr: $(GRUB_ASSEMBLE_DIR)/grub.i386-pc
 $(GRUB_ASSEMBLE_DIR)/grub.i386-pc : | $(WORKSPACE)
 	mkdir -p "$(GRUB_ASSEMBLE_DIR)"
-	grub-mkimage --prefix "(hd0,msdos1)/boot/grub" \
+	grub-mkimage --prefix "(hd0,msdos1)/grub" \
                 --output "$@" --format "i386-pc" \
                 $(IMAGE_GRUB_MBR_MODULES)
 
diff --git a/contrib/image/grub_early.cfg b/contrib/image/grub_early.cfg
index 3f3cb27fe79762c310d5cf0c07974e0a2c850a4b..dd794586a358c81291920899fe0c3a1ab7faea1a 100644
--- a/contrib/image/grub_early.cfg
+++ b/contrib/image/grub_early.cfg
@@ -1,7 +1,7 @@
 if [ -z "$prefix" -o ! -e "$prefix" ]; then
 	if ! search --file --set=root /.disk/info; then
 		search --file --set=root /.disk/mini-info
-	set prefix=($root)/boot/grub
+	set prefix=($root)/grub
 if [ -e $prefix/x86_64-efi/grub.cfg ]; then
 	source $prefix/x86_64-efi/grub.cfg
 else