diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index e1beef622e4f2dfa7b77ed95b09ea2ef7b2eaf7d..56558c4f154a865b487610200c2ad120899b4947 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -254,6 +254,10 @@ int RAND_poll(void)
          * at random times on Windows 2000.  Reported by Jeffrey Altman.  
          * Only use it on NT.
 	 */
+	/* Wolfgang Marczy <WMarczy@topcall.co.at> reports that
+	 * the RegQueryValueEx call below can hang on NT4.0 (SP6).
+	 * So we don't use this at all for now. */
+#if 0
         if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
 		osverinfo.dwMajorVersion < 5)
 		{
@@ -290,6 +294,7 @@ int RAND_poll(void)
 		if (buf)
 			free(buf);
 		}
+#endif
 
 	if (advapi)
 		{