diff --git a/ChangeLog b/ChangeLog
index 2c7ccc079b..f3882c233c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gdk/gdkpango.c (draw_error_underline): Fix offset to center the
+	underline in requested rectangle. (Ported from pango fix.)
+
 2006-05-29  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkdialog.h: removed forgotten declaration of
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c7ccc079b..f3882c233c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-30  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gdk/gdkpango.c (draw_error_underline): Fix offset to center the
+	underline in requested rectangle. (Ported from pango fix.)
+
 2006-05-29  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkdialog.h: removed forgotten declaration of
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 9375a80545..34df537f1b 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -278,7 +278,7 @@ draw_error_underline (cairo_t *cr,
   double y_top, y_bottom;
   int i;
 
-  x += (width - width_units * unit_width);
+  x += (width - width_units * unit_width) / 2;
   width = width_units * unit_width;
 
   y_top = y;