diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 477dc8885cf469e3d3ea69228808f99f22ccf298..636014b040ed40337d3c140a1ea42520518f6a69 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-29  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	PR middle-end/24053
+	* stor-layout.c (set_sizetype): Set TYPE_MAIN_VARIANT of bitsizetype.
+
 2005-09-29  Mark Mitchell  <mark@codesourcery.com>
 
 	* optabs.c (expand_binop): Initialize first_pass_p.
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 31d8becdac759ad26fa5b3f6b39e99609c9a82fe..f7bf20b03ad9e8a5c45ab0c2623ec447b9efac54 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1966,8 +1966,10 @@ set_sizetype (tree type)
   TYPE_PRECISION (t) = precision;
   TYPE_UID (t) = TYPE_UID (bitsizetype);
   TYPE_IS_SIZETYPE (t) = 1;
+
   /* Replace our original stub bitsizetype.  */
   memcpy (bitsizetype, t, tree_size (bitsizetype));
+  TYPE_MAIN_VARIANT (bitsizetype) = bitsizetype;
   
   if (TYPE_UNSIGNED (type))
     {