diff --git a/ChangeLog b/ChangeLog
index bdd5016872..155ae85bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 23 20:47:44 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_group): Actually
+	assign the new leader.  (#125168, Mariano Suarez-Alvarez)
+
 Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bdd5016872..155ae85bfd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Oct 23 20:47:44 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_group): Actually
+	assign the new leader.  (#125168, Mariano Suarez-Alvarez)
+
 Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bdd5016872..155ae85bfd 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Oct 23 20:47:44 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_group): Actually
+	assign the new leader.  (#125168, Mariano Suarez-Alvarez)
+
 Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bdd5016872..155ae85bfd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Oct 23 20:47:44 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_group): Actually
+	assign the new leader.  (#125168, Mariano Suarez-Alvarez)
+
 Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bdd5016872..155ae85bfd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Oct 23 20:47:44 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_group): Actually
+	assign the new leader.  (#125168, Mariano Suarez-Alvarez)
+
 Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 6366c85310..51bf934823 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1,3 +1,4 @@
+
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
@@ -3905,7 +3906,7 @@ gdk_window_set_group (GdkWindow *window,
     {
       if (toplevel->group_leader)
 	g_object_unref (toplevel->group_leader);
-      toplevel->group_leader = g_object_ref (toplevel->group_leader);
+      toplevel->group_leader = g_object_ref (leader);
     }
 
   update_wm_hints (window, FALSE);