diff --git a/glib/gmain.c b/glib/gmain.c
index c0c4581..e94e4d8 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -4640,7 +4640,8 @@ g_unix_signal_handler (int signum)
  * g_spawn_close_pid() in the callback function for the source.
  *
  * Note further that using g_child_watch_source_new() is not
- * compatible with calling <literal>waitpid(-1)</literal> in 
+ * compatible with calling <literal>waitpid</literal> with a
+ * nonpositive first argument in
  * the application. Calling waitpid() for individual pids will
  * still work fine.
  *
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 14d1b4c..ece8e10 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -415,7 +415,7 @@ g_spawn_sync (const gchar          *working_directory,
         {
           if (exit_status)
             {
-              g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but SIGCHLD action was set to SIG_IGN and ECHILD was received by waitpid(), so exit status can't be returned. This is a bug in the program calling g_spawn_sync(); either don't request the exit status, or don't set the SIGCHLD action.");
+              g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly.");
             }
           else
             {
