Index: tools/grub/grub-update.sh
===================================================================
--- tools/grub/grub-update.sh	(revision 3ef901d0aab775d849f9f8547d72b38c45ab2727)
+++ tools/grub/grub-update.sh	(revision a114e0953ae86477f5a778f6e683302eb54ec781)
@@ -72,6 +72,6 @@
 git reset --hard "$grub_rev" || exit 1
 
-echo "$grub_rev" >"$helenosdir"/boot/grub.pc/REVISION || exit 1
-echo "$grub_rev" > "$helenosdir"/boot/grub.efi/REVISION || exit 1
+echo "$grub_rev" >"$helenosdir"/boot/grub/ia32-pc/REVISION || exit 1
+echo "$grub_rev" > "$helenosdir"/boot/grub/ia32-efi/REVISION || exit 1
 
 # Build each platform to a different directory
@@ -82,10 +82,10 @@
 
 # Extract El Torrito boot image for i386-pc
-cd "$helenosdir"/boot/grub.pc || exit 1
+cd "$helenosdir"/boot/grub/ia32-pc || exit 1
 rm -f pc.img || exit 1
 "$builddir"/i386-pc/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
 
 # Extract El Torrito boot image for i386-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
+cd "$helenosdir"/boot/grub/ia32-efi || exit 1
 rm -f efi.img.gz || exit 1
 "$builddir"/i386-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
@@ -93,5 +93,5 @@
 
 # Extract El Torrito boot image for x86_64-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
+cd "$helenosdir"/boot/grub/ia32-efi || exit 1
 rm -f efi.img.gz || exit 1
 "$builddir"/x86_64-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
@@ -106,7 +106,7 @@
 
 # Update Grub files for all platforms
-grub_files_update grub.pc i386-pc
-grub_files_update grub.efi i386-efi
-grub_files_update grub.efi x86_64-efi
+grub_files_update grub/ia32-pc i386-pc
+grub_files_update grub/ia32-efi i386-efi
+grub_files_update grub/ia32-efi x86_64-efi
 
 echo "GRUB update successful."
Index: tools/grub/mkimage.sh
===================================================================
--- tools/grub/mkimage.sh	(revision 3ef901d0aab775d849f9f8547d72b38c45ab2727)
+++ tools/grub/mkimage.sh	(revision a114e0953ae86477f5a778f6e683302eb54ec781)
@@ -39,5 +39,5 @@
 orig_dir="$(cd "$(dirname "$0")" && pwd)"
 grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
-grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
+grub_mod_dir="$orig_dir/../../boot/grub/ia32-pc/i386-pc"
 
 "$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \