diff --git a/ChangeLog b/ChangeLog
index f014086e1..5061899a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-24  Christian Franke  <franke@computer.org>	
+	
+	* util/i386/pc/grub-install.in: If `--debug' is specified,
+	pass `--verbose' to grub-setup.
+	Abort script if make_system_path_relative_to_its_root() fails.
+
 2008-07-24  Bean  <bean123ch@gmail.com>
 
 	* configure.ac: Fixed a bug caused by the previous cygwin patch,
diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 1b2bccbb8..d7966d595 100644
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -127,8 +127,10 @@ if test "x$install_device" = x; then
 fi
 
 # If the debugging feature is enabled, print commands.
+setup_verbose=
 if test $debug = yes; then
     set -x
+    setup_verbose="--verbose"
 fi
 
 # Initialize these directories here, since ROOTDIR was initialized.
@@ -240,12 +242,12 @@ fi
 # The order in this list is critical.  Be careful when modifying it.
 modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module"
 
-$grub_mkimage --output=${grubdir}/core.img \
-    --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`/ \
-    $modules || exit 1
+grub_prefix="${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`" || exit 1
+
+$grub_mkimage --output=${grubdir}/core.img --prefix=${grub_prefix}/ $modules || exit 1
 
 # Now perform the installation.
-$grub_setup --directory=${grubdir} --device-map=${device_map} \
+$grub_setup ${setup_verbose} --directory=${grubdir} --device-map=${device_map} \
     ${install_device} || exit 1
 
 # Prompt the user to check if the device map is correct.