Index: tools/grub/grub-update.sh
===================================================================
--- tools/grub/grub-update.sh	(revision da3bc0e9e3951e0500ab4617a9ab5d9d8ea0a05b)
+++ tools/grub/grub-update.sh	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -58,4 +58,5 @@
 	cp -R "$builddir"/"$platform"/lib64/grub/"$platform" "$helenosdir"/boot/"$gdir" || exit 1
 	rm -f "$helenosdir"/boot/"$gdir"/"$platform"/*.image || exit 1
+	rm -f "$helenosdir"/boot/"$gdir"/"$platform"/*.module || exit 1
 	bzr add "$helenosdir"/boot/"$gdir"/"$platform" || exit 1
 }
@@ -109,6 +110,3 @@
 grub_files_update grub.efi x86_64-efi
 
-# Clean up
-rm -rf "$builddir" || exit 1
-
 echo "GRUB update successful."
Index: tools/grub/load.cfg
===================================================================
--- tools/grub/load.cfg	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
+++ tools/grub/load.cfg	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -0,0 +1,2 @@
+set root=(hd0,1)
+set prefix=($root)/boot/grub
Index: tools/grub/mkimage.sh
===================================================================
--- tools/grub/mkimage.sh	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
+++ tools/grub/mkimage.sh	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+# Copyright (c) 2016 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Build core.img GRUB image file for use by HelenOS installer (sysinst)
+# Note that we need a suitable build of Grub2 utilities, such as the one
+# we get by running grub-update.sh
+#
+# When sysinst can build core.img itself, this script (and its product,
+# prebuilt core.img in the source tree) will be no longer needed.
+#
+
+grub_tools_dir="$(pwd)"/grub-build/i386-pc/bin
+grub_mod_dir="$(pwd)"/../../boot/grub.pc/i386-pc
+
+"$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \
+    --prefix "$grub_mod_dir" --output "$grub_mod_dir"/"core.img" \
+    --format 'i386-pc' --compression 'auto' --config "$(pwd)"/"load.cfg" \
+    "minix3" "part_msdos" "biosdisk" "search_fs_uuid"