diff --git a/mambawelcome/mambawelcome.sh b/mambawelcome/mambawelcome.sh
index 0412973..8298914 100755
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -44,6 +44,10 @@ Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
 
 dcop_write $"Configuring..." 5
 
+# update grub device mappings and config
+/usr/sbin/grub-mkdevicemap -n
+/usr/sbin/update-grub
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort
@@ -159,10 +163,6 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
    sed -i "s|netbios name =.*|netbios name = $INSTALL_HOSTNAME|" /etc/samba/smb.conf
 }
 
-# update grub device mappings and config
-/usr/sbin/grub-mkdevicemap -n
-/usr/sbin/update-grub
-
 # configure suspend (from suspend rpm post script) and recreate mkinitramfs
 grep path_to_resume_device_file /etc/suspend.conf && {
    SWAPLINE=`/sbin/swapon -s |grep -m1 ^/dev/`