diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 2bdc27cac4..d668860b53 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Use "16 bit int" arg 
+	in call to srand if "32 bit int" doesn't fit into "int".
+
 2010-05-22	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libblock/src/flashdisk.c, libblock/src/nvdisk.c:
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c b/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
index d701a9d4a2..a169ad139c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
@@ -385,7 +385,11 @@ rtems_rfs_bitmap_unit_test (void)
   printf (" Bit clear value     : %d\n", RTEMS_RFS_BITMAP_BIT_CLEAR);
   printf (" Num bit per element : %zd\n", rtems_rfs_bitmap_element_bits ());
 
-  srand (0x23984237UL);
+#if INT_MAX >= 0x23984237
+  srand (0x23984237);
+#else
+  srand (0x2398);
+#endif
   
   rtems_rfs_bitmap_ut_test_bitmap (2048);
   rtems_rfs_bitmap_ut_test_bitmap (420);