diff --git a/ChangeLog b/ChangeLog
index a3cf5489f3..8e207e7d53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
+
+	* random.c (random_seed): use /dev/urandom if available.
+	  [ruby-dev:25392]
+
 Mon Jan  3 11:03:37 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/test_drb.rb: move TestDRbReusePort to new file. 
diff --git a/random.c b/random.c
index a317aa5cc1..e8fa78b944 100644
--- a/random.c
+++ b/random.c
@@ -144,6 +144,11 @@ genrand_real()
 #include <unistd.h>
 #endif
 #include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 
 static int first = 1;
 
@@ -167,9 +172,22 @@ random_seed()
 {
     static int n = 0;
     struct timeval tv;
+    unsigned long result;
+    int fd;
+    unsigned long buf;
 
     gettimeofday(&tv, 0);
-    return tv.tv_sec ^ tv.tv_usec ^ getpid() ^ n++;
+    result = tv.tv_sec ^ tv.tv_usec ^ getpid() ^ n++;
+
+    result += (unsigned long)&result;
+
+    if ((fd = open("/dev/urandom", O_RDONLY)) >= 0) {
+        read(fd, &buf, sizeof(buf));
+        close(fd);
+        result ^= buf;
+    }
+
+    return result;
 }
 
 /*