diff --git a/ChangeLog b/ChangeLog
index c8bf716b0..9895a2fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Jon McCune  <jonmccune@google.com>
+
+	Fix double-free introduced by commit 33d02a42d64cf06cada1c389
+
 2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Unify message for unsupported relocation.
diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index 85a72d65f..87c6d4f2c 100644
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -885,6 +885,7 @@ grub_pubkey_open (grub_file_t io, const char *filename)
   if (err)
     return NULL;
   io->device = 0;
+  io->name = 0;
   grub_file_close (io);
   return ret;
 }
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 6327fda35..aec798f59 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -1275,6 +1275,7 @@ grub_gzio_close (grub_file_t file)
 
   /* No need to close the same device twice.  */
   file->device = 0;
+  file->name = 0;
 
   return grub_errno;
 }
diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c
index b1ce26029..de2ea6778 100644
--- a/grub-core/io/lzopio.c
+++ b/grub-core/io/lzopio.c
@@ -525,6 +525,7 @@ grub_lzopio_close (grub_file_t file)
 
   /* Device must not be closed twice.  */
   file->device = 0;
+  file->name = 0;
   return grub_errno;
 }
 
diff --git a/grub-core/io/xzio.c b/grub-core/io/xzio.c
index e57f8019e..a3536ad73 100644
--- a/grub-core/io/xzio.c
+++ b/grub-core/io/xzio.c
@@ -319,6 +319,7 @@ grub_xzio_close (grub_file_t file)
 
   /* Device must not be closed twice.  */
   file->device = 0;
+  file->name = 0;
   return grub_errno;
 }