diff --git a/ChangeLog b/ChangeLog
index 197158f50..85fcbb02c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-setup.c (main) [GRUB_MACHINE_IEEE1275]: Propagate argp
+	usage.
+
 2010-09-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Put terminfo into core on ieee1275 and yeeloong (needed for console).
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 953f0038b..920d867f2 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -838,10 +838,6 @@ main (int argc, char *argv[])
   int must_embed = 0;
   struct arguments arguments;
 
-#ifdef GRUB_MACHINE_IEEE1275
-  force = 1;
-#endif
-
   set_program_name (argv[0]);
 
   grub_util_init_nls ();
@@ -857,6 +853,10 @@ main (int argc, char *argv[])
       exit(1);
     }
 
+#ifdef GRUB_MACHINE_IEEE1275
+  arguments.force = 1;
+#endif
+
   if (verbosity > 1)
     grub_env_set ("debug", "all");