diff --git a/ChangeLog b/ChangeLog
index 3a6f09353..a122362c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-09  Havoc Pennington  <hp@pobox.com>
+
+	* src/delete.c (delete_ping_timeout_func): add G_IO_NVAL to watch
+	condition, patch from Gustavo Giraldez, avoids another 100% CPU
+	thingy
+
 2002-06-09  Havoc Pennington  <hp@pobox.com>
 
 	* src/place.c (meta_window_place): don't run constrain_placement
diff --git a/src/delete.c b/src/delete.c
index c7416c4da..7acb69757 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,7 +1,7 @@
 /* Metacity window deletion */
 
 /* 
- * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2001, 2002 Havoc Pennington
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -341,7 +341,7 @@ delete_ping_timeout_func (MetaDisplay *display,
 
   channel = g_io_channel_unix_new (window->dialog_pipe);
   g_io_add_watch_full (channel, G_PRIORITY_DEFAULT,
-                       G_IO_IN | G_IO_HUP | G_IO_ERR,
+                       G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
                        io_from_ping_dialog,
                        NULL, NULL);
   g_io_channel_unref (channel);