diff --git a/ChangeLog b/ChangeLog
index 4e30a39a8..f0d881599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-28  Christian Schmitt  <chris@ilovelinux.de>
+
+        * util/ieee1275/grub-install.in: Fix nvsetenv arguments.
+
 2010-01-28  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* include/grub/script_sh.h (sourcecode): Add const qualifier.
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 9a26b0dca..97c485d55 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -46,8 +46,8 @@ install_device=
 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 @@ if test $update_nvram = yes; then
     }
 
     # 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