diff --git a/ChangeLog b/ChangeLog
index 2470802090..fcdc620e0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-04-23  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #9920]
+	* stdlib/random_r.c (__srandom_r): Change type of word to int32_t
+	to get consistency between 32 and 64 bit architectures.
+
 	[BZ #10052]
 	* sysdeps/unix/make-syscalls.sh: Add rule to create target
 	directory for dummy syscall rules.
diff --git a/stdlib/random_r.c b/stdlib/random_r.c
index 5e564a737d..a30055f598 100644
--- a/stdlib/random_r.c
+++ b/stdlib/random_r.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1995, 2005 Free Software Foundation
+   Copyright (C) 1995, 2005, 2009 Free Software Foundation
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -166,7 +166,7 @@ __srandom_r (seed, buf)
   int type;
   int32_t *state;
   long int i;
-  long int word;
+  int32_t word;
   int32_t *dst;
   int kc;