diff --git a/ChangeLog b/ChangeLog
index bc227f4dfcf4d1b16b72ffa62347ec416e45787e..c29503bc12b1ebff2fb7f39fae18288408dcb9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gstring.c (g_string_chunk_new): Don't shadow size.
+	(#386760, Kazuki IWAMOTO)
+
 2006-12-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gstring.c: Move more documentation inline.
diff --git a/glib/gstring.c b/glib/gstring.c
index 267393111519f8082cb2d041295ecb6df4382d2b..7b2b9749319c3b7fa2849ddf5fc0d2c220965067 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -139,15 +139,15 @@ GStringChunk*
 g_string_chunk_new (gsize size)    
 {
   GStringChunk *new_chunk = g_new (GStringChunk, 1);
-  gsize size = 1;    
+  gsize actual_size = 1;    
 
-  size = nearest_power (1, size);
+  actual_size = nearest_power (1, size);
 
   new_chunk->const_table       = NULL;
   new_chunk->storage_list      = NULL;
-  new_chunk->storage_next      = size;
-  new_chunk->default_size      = size;
-  new_chunk->this_size         = size;
+  new_chunk->storage_next      = actual_size;
+  new_chunk->default_size      = actual_size;
+  new_chunk->this_size         = actual_size;
 
   return new_chunk;
 }