diff --git a/ChangeLog b/ChangeLog
index 72effd8858..cc144fe640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_focus): Support the latest
+	EWMH additions to the _NET_ACTIVE_WINDOW client message 
+	format.  (#150668, Elijah Newren)
+
 2004-08-22  Philip Langdale  <plangdale@vmware.com>
 
 	* gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72effd8858..cc144fe640 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_focus): Support the latest
+	EWMH additions to the _NET_ACTIVE_WINDOW client message 
+	format.  (#150668, Elijah Newren)
+
 2004-08-22  Philip Langdale  <plangdale@vmware.com>
 
 	* gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72effd8858..cc144fe640 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_focus): Support the latest
+	EWMH additions to the _NET_ACTIVE_WINDOW client message 
+	format.  (#150668, Elijah Newren)
+
 2004-08-22  Philip Langdale  <plangdale@vmware.com>
 
 	* gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72effd8858..cc144fe640 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_focus): Support the latest
+	EWMH additions to the _NET_ACTIVE_WINDOW client message 
+	format.  (#150668, Elijah Newren)
+
 2004-08-22  Philip Langdale  <plangdale@vmware.com>
 
 	* gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index bd0ba5fa89..c318a61084 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1722,9 +1722,9 @@ gdk_window_focus (GdkWindow *window,
       xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display,
 									"_NET_ACTIVE_WINDOW");
       xev.xclient.format = 32;
-      xev.xclient.data.l[0] = 0;
-      xev.xclient.data.l[1] = 0;
-      xev.xclient.data.l[2] = 0;
+      xev.xclient.data.l[0] = 1; /* requestor type; we're an app */
+      xev.xclient.data.l[1] = timestamp;
+      xev.xclient.data.l[2] = None; /* currently active window */
       xev.xclient.data.l[3] = 0;
       xev.xclient.data.l[4] = 0;