diff --git a/ChangeLog b/ChangeLog
index 794fdf719..5dd39905e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkpasswd-pbkdf2.c (main): Use /dev/urandom and not
+	/dev/random. /dev/urandom is good enough for our purposes (salting).
+
 2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in (process_input_dir): Include efiemu??.o.
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index fe1887f8f..dc2afdb6e 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
   {
     FILE *f;
     size_t rd;
-    f = fopen ("/dev/random", "rb");
+    f = fopen ("/dev/urandom", "rb");
     if (!f)
       {
 	memset (pass1, 0, strlen (pass1));