diff --git a/ChangeLog b/ChangeLog
index 3a6231356d..993290d235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdlib/divmod_1.c: Use correct type for dummy variable.
+	* stdlib/mod_1.c: Likewise.
+
 2008-10-16  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/dl-tls.c (_dl_update_slotinfo): Copy all of the initial DTV.
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index edbc953e4a..e234a0a82a 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -634,7 +634,7 @@ _dl_update_slotinfo (unsigned long int req_modid)
 		      newp = malloc ((2 + newsize) * sizeof (dtv_t));
 		      if (newp == NULL)
 			oom ();
-		      memcpy (newp, &dtv[-1], (2 * oldsize) * sizeof (dtv_t));
+		      memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t));
 		    }
 		  else
 		    {
diff --git a/stdlib/divmod_1.c b/stdlib/divmod_1.c
index 51a47d85d3..0a8a77e12e 100644
--- a/stdlib/divmod_1.c
+++ b/stdlib/divmod_1.c
@@ -55,7 +55,7 @@ mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb)
 {
   mp_size_t i;
   mp_limb_t n1, n0, r;
-  int dummy;
+  mp_limb_t dummy;
 
   /* ??? Should this be handled at all?  Rely on callers?  */
   if (dividend_size == 0)
diff --git a/stdlib/mod_1.c b/stdlib/mod_1.c
index 3273c9222d..f4cfa6933f 100644
--- a/stdlib/mod_1.c
+++ b/stdlib/mod_1.c
@@ -50,7 +50,7 @@ mpn_mod_1 (dividend_ptr, dividend_size, divisor_limb)
 {
   mp_size_t i;
   mp_limb_t n1, n0, r;
-  int dummy;
+  mp_limb_t dummy;
 
   /* Botch: Should this be handled at all?  Rely on callers?  */
   if (dividend_size == 0)