diff --git a/ChangeLog b/ChangeLog
index 2e659f3cb3..7440bcc23a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 11 02:37:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (limited_rand): expands to long before shift so tha
+	  the result does not overflow.
+
 Sat Jul 11 00:16:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (rand_init): got rid of buffer overflow.
diff --git a/random.c b/random.c
index 3ae9197277..bcc16aa5b3 100644
--- a/random.c
+++ b/random.c
@@ -414,8 +414,8 @@ limited_rand(struct MT *mt, unsigned long limit)
   retry:
     val = 0;
     for (i = SIZEOF_LONG/4-1; 0 <= i; i--) {
-        if (mask >> (i * 32)) {
-            val |= genrand_int32(mt) << (i * 32);
+        if ((mask >> (i * 32)) & 0xffffffff) {
+            val |= (unsigned long)genrand_int32(mt) << (i * 32);
             val &= mask;
             if (limit < val)
                 goto retry;