--- util/ieee1275/grub-install.in	2010-01-27 09:21:05.000000000 +0100
+++ util/ieee1275/grub-install.in.new	2010-01-27 09:32:58.000000000 +0100
@@ -46,8 +46,8 @@
 debug=no
 update_nvram=yes
 
-ofpathname=/usr/sbin/ofpathname
-nvsetenv=/sbin/nvsetenv
+ofpathname=`which ofpathname`
+nvsetenv=`which nvsetenv`
 
 # Usage: usage
 # Print the usage.
@@ -216,11 +216,11 @@
     }
 
     # Point boot-device at the new grub install
-    boot_device="boot-device $ofpath:$partno,\\grub"
-    "$nvsetenv" "$boot_device" || {
+    boot_device="$ofpath:$partno,\\grub"
+    "$nvsetenv" boot-device "$boot_device" || {
 	echo "$nvsetenv failed."
 	echo "You will have to set boot-device manually.  At the Open Firmware prompt, type:"
-	echo "  setenv $boot_device"
+	echo "  setenv boot-device $boot_device"
 	exit 1
     }
 fi