Index: tools/grub/grub-update.sh
===================================================================
--- tools/grub/grub-update.sh	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
+++ tools/grub/grub-update.sh	(revision a7bd30f29fbc40234dcf8a58c93a43b8fc5ead29)
@@ -33,8 +33,8 @@
 #
 
-origdir="$(pwd)"
+origdir="$(cd "$(dirname "$0")" && pwd)"
 helenosdir="$origdir/../.."
-workdir="$(pwd)/grub-src"
-builddir="$(pwd)/grub-build"
+workdir="$origdir/grub-src"
+builddir="$origdir/grub-build"
 git_repo="git://git.savannah.gnu.org/grub.git"
 grub_rev="bc220962e366b1b46769ed6f9fa5be603ba58ab5"
Index: tools/grub/mkimage.sh
===================================================================
--- tools/grub/mkimage.sh	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
+++ tools/grub/mkimage.sh	(revision a7bd30f29fbc40234dcf8a58c93a43b8fc5ead29)
@@ -37,9 +37,10 @@
 #
 
-grub_tools_dir="$(pwd)"/grub-build/i386-pc/bin
-grub_mod_dir="$(pwd)"/../../boot/grub.pc/i386-pc
+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_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" \
+    --prefix "$grub_mod_dir" --output "$grub_mod_dir/core.img" \
+    --format 'i386-pc' --compression 'auto' --config "$orig_dir/load.cfg" \
     "minix3" "part_msdos" "biosdisk" "search_fs_uuid"