diff --git a/lib/roken/rand.c b/lib/roken/rand.c
index ef92c2052..cfae5107e 100644
--- a/lib/roken/rand.c
+++ b/lib/roken/rand.c
@@ -33,6 +33,10 @@
 
 #include "roken.h"
 
+#ifdef HAVE_WIN32_RAND_S
+static int hasRand_s = 1;
+#endif
+
 void ROKEN_LIB_FUNCTION
 rk_random_init(void)
 {
@@ -43,6 +47,32 @@ rk_random_init(void)
 #elif defined(HAVE_RANDOM)
     srandom(time(NULL));
 #else
+# ifdef HAVE_WIN32_RAND_S
+    OSVERSIONINFO osInfo;
+
+    osInfo.dwOSVersionInfoSize = sizeof(osInfo);
+    hasRand_s =
+	(GetVersionEx(&osInfo)
+	  && ((osInfo.dwMajorVersion > 5) ||
+	       (osInfo.dwMajorVersion == 5) && (osInfo.dwMinorVersion >= 1)));
+# endif
     srand (time(NULL));
 #endif
 }
+
+#ifdef HAVE_WIN32_RAND_S
+unsigned int ROKEN_LIB_FUNCTION
+rk_random(void)
+{
+    if (hasRand_s) {
+	unsigned int n;
+	int code;
+
+	code = rand_s(&n);
+	if (code == 0)
+	    return n;
+    }
+
+    return rand();
+}
+#endif
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 14034dc12..910c79a46 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -32,6 +32,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(_WIN32) && _MSC_VER >= 1400
+/* _CRT_RAND_S must be defined before including stdlib.h */
+# define _CRT_RAND_S
+# define HAVE_WIN32_RAND_S 1
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1187,11 +1193,16 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL memset_s(void *s, size_t smax,
 #endif
 
 #if defined(HAVE_ARC4RANDOM)
-#define rk_random() arc4random()
+# define rk_random() arc4random()
 #elif defined(HAVE_RANDOM)
-#define rk_random() random()
+# define rk_random() random()
 #else
-#define rk_random() rand()
+# ifdef HAVE_WIN32_RAND_S
+ROKEN_LIB_FUNCTION unsigned int ROKEN_LIB_CALL
+rk_random(void);
+# else
+#  define rk_random() rand()
+# endif
 #endif
 
 #ifndef HAVE_TDELETE