diff --git a/ChangeLog b/ChangeLog
index 356fc8e20..e7cfe0435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkpasswd-pbkdf2.c (grub_get_random): Add windows and
+	GNU/Hurd to the list of checked PRNG.
+
 2013-09-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: On FreeBSD use -melf_*_fbsd format.
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index 36b06ac12..0e09a02c3 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -112,7 +112,7 @@ hexify (char *hex, grub_uint8_t *bin, grub_size_t n)
 static int
 grub_get_random (void *out, grub_size_t len)
 {
-#if ! defined (__linux__) && ! defined (__FreeBSD__) && ! defined (__OpenBSD__)
+#if ! defined (__linux__) && ! defined (__FreeBSD__) && ! defined (__OpenBSD__) && !defined (__GNU__) && ! defined (_WIN32) && !defined(__CYGWIN__)
   /* TRANSLATORS: The generator might still be secure just GRUB isn't sure about it.  */
   printf ("%s", _("WARNING: your random generator isn't known to be secure\n"));
 #warning "your random generator isn't known to be secure"