diff --git a/ChangeLog b/ChangeLog
index abe285ee9..59cb3ec57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkpasswd-pbkdf2.c (main): Don't double-close.
+	Reported by: David Volgyes <dvolgyes>.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy): Close
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index dc2afdb6e..709ba7da7 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -270,7 +270,6 @@ main (int argc, char *argv[])
 	free (bufhex);
 	free (salthex);
 	free (salt);
-	fclose (f);
 	grub_util_error ("couldn't retrieve random data for salt");
       }
     fclose (f);