diff --git a/ChangeLog b/ChangeLog
index 0c4df6f5b..8387dfb5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/core/display.c: remove apparently spurious warnings about
+	operations on window "none"
+
+2008-11-23  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/core/util.c: Set _POSIX_C_SOURCE to 200112L as it should always
+	have been, in an attempt to close #561962.
+
 2008-11-22  Thomas Thurman  <tthurman@gnome.org>
 
 	* configure.in: Set -ansi so people stop complaining about C99.
diff --git a/src/core/display.c b/src/core/display.c
index 8169541ba..daac23f36 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3264,9 +3264,10 @@ meta_display_begin_grab_op (MetaDisplay *display,
   
   if (display->grab_op != META_GRAB_OP_NONE)
     {
-      meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
-                    op, window ? window->desc : "none", display->grab_op,
-                    display->grab_window ? display->grab_window->desc : "none");
+      if (window)
+        meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
+                      op, window->desc, display->grab_op,
+                      display->grab_window ? display->grab_window->desc : "none");
       return FALSE;
     }
 
diff --git a/src/core/util.c b/src/core/util.c
index ca7df62aa..bcfcb7f4d 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#define _POSIX_C_SOURCE /* for fdopen() */
+#define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
 #include <config.h>
 #include "util.h"