diff --git a/ChangeLog b/ChangeLog
index 27a852ba33..61c1fa5628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Handle
+	gtk-alternative-button-order (setting it to TRUE).
+
 2005-05-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_search_init): Remove
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 27a852ba33..61c1fa5628 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-24  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Handle
+	gtk-alternative-button-order (setting it to TRUE).
+
 2005-05-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_search_init): Remove
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 27a852ba33..61c1fa5628 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-24  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Handle
+	gtk-alternative-button-order (setting it to TRUE).
+
 2005-05-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_search_init): Remove
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 7ce91c6ff1..21ca464d2d 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -598,6 +598,12 @@ gdk_screen_get_setting (GdkScreen   *screen,
       g_value_set_boolean (value, FALSE);
       return TRUE;
     }
+  else if (strcmp ("gtk-alternative-button-order", name) == 0)
+    {
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : TRUE\n", name));
+      g_value_set_boolean (value, TRUE);
+      return TRUE;
+    }
 #if 0
   /*
    * With 'MS Sans Serif' as windows menu font (default on win98se) you'll get a