diff --git a/ChangeLog b/ChangeLog
index 6886f2995..10c094b80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-20  Leif Lindholm  <leif.lindholm@arm.com>
+
+	* util/grub-mkimage.c (main): Postpone freeing arguments.output
+	until after its use in generate_image.
+
 2013-01-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index d0eecf2f6..29bda1715 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1905,7 +1905,6 @@ main (int argc, char *argv[])
       if (! fp)
 	grub_util_error (_("cannot open `%s': %s"), arguments.output,
 			 strerror (errno));
-      free (arguments.output);
     }
 
   if (!arguments.dir)
@@ -1933,5 +1932,8 @@ main (int argc, char *argv[])
   if (arguments.dir)
     free (arguments.dir);
 
+  if (arguments.output)
+    free (arguments.output);
+
   return 0;
 }