diff --git a/ChangeLog b/ChangeLog
index 4e48c3f18..630829b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/i386/pc/grub-mkimage.c (main): Oops, free `output' only
+	after it's no longer needed.
+
 2009-06-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/loader.h (grub_linux_prot_size)
diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index 19adc55a7..86bfd653f 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -411,9 +411,9 @@ main (int argc, char *argv[])
   if (output)
     {
       fp = fopen (output, "wb");
-      free (output);
       if (! fp)
 	grub_util_error ("cannot open %s", output);
+      free (output);
     }
 
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,