diff --git a/ChangeLog b/ChangeLog
index f0d8cb3ff5..f379b8ba19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkarrow.c:
+	* gtk/gtkimage.c:
+	* gtk/gtklabel.c:
+	* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
+	on centering calculations to match the behaviour of other parts
+	of GTK+. (#307419, Ryan Lortie)
+
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f0d8cb3ff5..f379b8ba19 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkarrow.c:
+	* gtk/gtkimage.c:
+	* gtk/gtklabel.c:
+	* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
+	on centering calculations to match the behaviour of other parts
+	of GTK+. (#307419, Ryan Lortie)
+
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f0d8cb3ff5..f379b8ba19 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkarrow.c:
+	* gtk/gtkimage.c:
+	* gtk/gtklabel.c:
+	* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
+	on centering calculations to match the behaviour of other parts
+	of GTK+. (#307419, Ryan Lortie)
+
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_source_set): Connect to 
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index f9568e481f..350b404124 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -260,11 +260,9 @@ gtk_arrow_expose (GtkWidget      *widget,
 	}
 
       x = floor (widget->allocation.x + misc->xpad
-		 + ((widget->allocation.width - extent) * xalign)
-		 + 0.5);
+		 + ((widget->allocation.width - extent) * xalign));
       y = floor (widget->allocation.y + misc->ypad 
-		 + ((widget->allocation.height - extent) * misc->yalign)
-		 + 0.5);
+		 + ((widget->allocation.height - extent) * misc->yalign));
       
       shadow_type = arrow->shadow_type;
 
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 40f196f29e..9fabd8e4d7 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1576,11 +1576,9 @@ gtk_image_expose (GtkWidget      *widget,
 	xalign = 1.0 - misc->xalign;
   
       x = floor (widget->allocation.x + misc->xpad
-		 + ((widget->allocation.width - widget->requisition.width) * xalign)
-		 + 0.5);
+		 + ((widget->allocation.width - widget->requisition.width) * xalign));
       y = floor (widget->allocation.y + misc->ypad 
-		 + ((widget->allocation.height - widget->requisition.height) * misc->yalign)
-		 + 0.5);
+		 + ((widget->allocation.height - widget->requisition.height) * misc->yalign));
       mask_x = x;
       mask_y = y;
       
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 79e9fd89c7..df890c9b80 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2177,8 +2177,7 @@ get_layout_location (GtkLabel  *label,
     req_width = widget->requisition.width;
 
   x = floor (widget->allocation.x + (gint)misc->xpad +
-	      xalign * (widget->allocation.width - req_width)
-	      + 0.5);
+	      xalign * (widget->allocation.width - req_width));
 
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
     x = MAX (x, widget->allocation.x + misc->xpad);
@@ -2188,8 +2187,8 @@ get_layout_location (GtkLabel  *label,
 	     req_width - misc->xpad);
 
   y = floor (widget->allocation.y + (gint)misc->ypad 
-             + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign)
-		    + 0.5, 0));
+             + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
+	     0));
 
   if (xp)
     *xp = x;
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index 63caf65d13..4768f77f7b 100644
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -212,11 +212,9 @@ gtk_pixmap_expose (GtkWidget      *widget,
 	xalign = 1.0 - misc->xalign;
   
       x = floor (widget->allocation.x + misc->xpad
-		 + ((widget->allocation.width - widget->requisition.width) * xalign)
-		 + 0.5);
+		 + ((widget->allocation.width - widget->requisition.width) * xalign));
       y = floor (widget->allocation.y + misc->ypad 
-		 + ((widget->allocation.height - widget->requisition.height) * misc->yalign)
-		 + 0.5);
+		 + ((widget->allocation.height - widget->requisition.height) * misc->yalign));
       
       if (pixmap->mask)
 	{