diff --git a/ChangeLog b/ChangeLog
index cdce0d4237..bfa19a7799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-09  Cody Russell  <bratsche@gnome.org>
+
+	Merge from trunk:
+
+	* modules/engines/ms-windows/msw_style.c: MS-Windows Theme top tabs
+	rendered upside down for non-XP theme (#435053, Daniel Atallah)
+
 2007-05-09  Loïc Minier  <lool@dooz.org>
 
 	* gdk/directfb/Makefile.am:
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index cbd7ed4871..6d68a718a5 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -2669,7 +2669,7 @@ draw_extension (GtkStyle *style,
           if (!draw_tab_button (style, window, state_type,
                                 shadow_type, area, widget,
                                 detail,
-                                x, y, width, height, gap_side))
+                                x, y, width, height, real_gap_side))
             {
               parent_class->draw_extension (style, window, state_type,
                                             shadow_type, area, widget, detail,