diff --git a/ChangeLog b/ChangeLog
index 62c77dbf9..54002a9c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-21  Anders Carlsson  <andersca@gnome.org>
+
+	* src/window.c: (meta_window_client_message):
+	Get the timestamp from the client message.
+
 Sat Jun 19 02:21:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Fix bug 143333, support for update counter spec, and 109362,
diff --git a/src/window.c b/src/window.c
index 0d70e974d..e55e4ba58 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3696,11 +3696,14 @@ meta_window_client_message (MetaWindow *window,
   if (event->xclient.message_type ==
       display->atom_net_close_window)
     {
-      /* I think the wm spec should maybe put a time
-       * in this message, CurrentTime here is sort of
-       * bogus. But it rarely matters most likely.
-       */
-      meta_window_delete (window, meta_display_get_current_time (window->display));
+      Time timestamp;
+
+      if (event->xclient.data.l[0] != 0)
+	timestamp = event->xclient.data.l[0];
+      else
+	timestamp = meta_display_get_current_time (window->display);
+      
+      meta_window_delete (window, timestamp);
 
       return TRUE;
     }