diff --git a/ChangeLog b/ChangeLog
index fa0adb6d28..5f58d8f8f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Aug 21 01:33:51 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): always round
+	approximate digit widths up, to avoid truncation, convert to
+	pango pixels when we have the full string width instead of converting
+	the approx digit width to pango pixels, take inner border and
+	interior focus into account correctly. (Fixes #116368, patch from
+	Morten Welinder).
+
 2003-08-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* gtk/queryimmodules.c: Don't look at the same directory twice (in
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fa0adb6d28..5f58d8f8f2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Thu Aug 21 01:33:51 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): always round
+	approximate digit widths up, to avoid truncation, convert to
+	pango pixels when we have the full string width instead of converting
+	the approx digit width to pango pixels, take inner border and
+	interior focus into account correctly. (Fixes #116368, patch from
+	Morten Welinder).
+
 2003-08-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* gtk/queryimmodules.c: Don't look at the same directory twice (in
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fa0adb6d28..5f58d8f8f2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Thu Aug 21 01:33:51 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): always round
+	approximate digit widths up, to avoid truncation, convert to
+	pango pixels when we have the full string width instead of converting
+	the approx digit width to pango pixels, take inner border and
+	interior focus into account correctly. (Fixes #116368, patch from
+	Morten Welinder).
+
 2003-08-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* gtk/queryimmodules.c: Don't look at the same directory twice (in
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fa0adb6d28..5f58d8f8f2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Thu Aug 21 01:33:51 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): always round
+	approximate digit widths up, to avoid truncation, convert to
+	pango pixels when we have the full string width instead of converting
+	the approx digit width to pango pixels, take inner border and
+	interior focus into account correctly. (Fixes #116368, patch from
+	Morten Welinder).
+
 2003-08-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* gtk/queryimmodules.c: Don't look at the same directory twice (in
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fa0adb6d28..5f58d8f8f2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Thu Aug 21 01:33:51 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): always round
+	approximate digit widths up, to avoid truncation, convert to
+	pango pixels when we have the full string width instead of converting
+	the approx digit width to pango pixels, take inner border and
+	interior focus into account correctly. (Fixes #116368, patch from
+	Morten Welinder).
+
 2003-08-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* gtk/queryimmodules.c: Don't look at the same directory twice (in
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 67de310d10..cf4565ecf5 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -652,7 +652,8 @@ gtk_spin_button_size_request (GtkWidget      *widget,
 					   pango_context_get_language (context));
 
       digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
-      digit_width = PANGO_PIXELS (digit_width);
+      digit_width = PANGO_SCALE *
+        ((digit_width + PANGO_SCALE - 1) / PANGO_SCALE);
 
       pango_font_metrics_unref (metrics);
       
@@ -664,15 +665,15 @@ gtk_spin_button_size_request (GtkWidget      *widget,
 
       string_len = compute_double_length (spin_button->adjustment->upper,
                                           spin_button->digits);
-      w = MIN (string_len, max_string_len) * digit_width;
+      w = PANGO_PIXELS (MIN (string_len, max_string_len) * digit_width);
       width = MAX (width, w);
       string_len = compute_double_length (spin_button->adjustment->lower,
 					  spin_button->digits);
-      w = MIN (string_len, max_string_len) * digit_width;
+      w = PANGO_PIXELS (MIN (string_len, max_string_len) * digit_width);
       width = MAX (width, w);
       
-      requisition->width = width;
-      if (interior_focus)
+      requisition->width = width + /* INNER_BORDER */ 2 * 2;
+      if (!interior_focus)
 	requisition->width += 2 * focus_width;
     }