diff --git a/ChangeLog b/ChangeLog
index d92ae9c3ab..497758aa92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>
+
+	 #109594, reported by Olivier Ripoll
+
+	* gtk/gtkentry.c (gtk_entry_size_request): Use max of 
+	width and digit width for gtk_entry_set_width_chars,
+	and round up.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
+	width of the entry to 7 chars.
+
 Wed Mar  3 16:00:10 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Strip out the "export-dynamic" libtool
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d92ae9c3ab..497758aa92 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>
+
+	 #109594, reported by Olivier Ripoll
+
+	* gtk/gtkentry.c (gtk_entry_size_request): Use max of 
+	width and digit width for gtk_entry_set_width_chars,
+	and round up.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
+	width of the entry to 7 chars.
+
 Wed Mar  3 16:00:10 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Strip out the "export-dynamic" libtool
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d92ae9c3ab..497758aa92 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>
+
+	 #109594, reported by Olivier Ripoll
+
+	* gtk/gtkentry.c (gtk_entry_size_request): Use max of 
+	width and digit width for gtk_entry_set_width_chars,
+	and round up.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
+	width of the entry to 7 chars.
+
 Wed Mar  3 16:00:10 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Strip out the "export-dynamic" libtool
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d92ae9c3ab..497758aa92 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>
+
+	 #109594, reported by Olivier Ripoll
+
+	* gtk/gtkentry.c (gtk_entry_size_request): Use max of 
+	width and digit width for gtk_entry_set_width_chars,
+	and round up.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
+	width of the entry to 7 chars.
+
 Wed Mar  3 16:00:10 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Strip out the "export-dynamic" libtool
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d92ae9c3ab..497758aa92 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>
+
+	 #109594, reported by Olivier Ripoll
+
+	* gtk/gtkentry.c (gtk_entry_size_request): Use max of 
+	width and digit width for gtk_entry_set_width_chars,
+	and round up.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
+	width of the entry to 7 chars.
+
 Wed Mar  3 16:00:10 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Strip out the "export-dynamic" libtool
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 5f4dad56e2..0720c28447 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1928,7 +1928,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
                         priv->hex_entry,
                         _("You can enter an HTML-style hexadecimal color value, or simply a color name such as 'orange' in this entry."), NULL);
   
-  gtk_widget_set_size_request (priv->hex_entry, 75, -1);  
+  gtk_entry_set_width_chars (GTK_ENTRY (priv->hex_entry), 7);
   gtk_table_set_col_spacing (GTK_TABLE (table), 3, 15);
   gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);
   
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3101d6f086..792c606c22 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1144,7 +1144,10 @@ gtk_entry_size_request (GtkWidget      *widget,
   else
     {
       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
-      requisition->width = PANGO_PIXELS (char_width) * entry->width_chars + xborder * 2;
+      gint digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+      gint char_pixels = (MAX (char_width, digit_width) + PANGO_SCALE - 1) / PANGO_SCALE;
+      
+      requisition->width = char_pixels * entry->width_chars + xborder * 2;
     }
     
   requisition->height = PANGO_PIXELS (entry->ascent + entry->descent) + yborder * 2;