diff --git a/ChangeLog b/ChangeLog
index ffbca8d31..c5ce3c239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2005-04-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmain.c (g_child_watch_source_new): Add a note regarding
+	waitpid(-1).
+	(g_child_watch_source_init_multi_threaded): 
+	(g_child_watch_source_init_single): Don't use SA_RESTART,
+	since it causes problems on at least one platform. (#168352)
+
 2005-03-31  Steve Murphy  <murf@e-tools.com>
 
-        * configure.in: Added "rw" to ALL_LINGUAS.
+	* configure.in: Added "rw" to ALL_LINGUAS.
 
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ffbca8d31..c5ce3c239 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,14 @@
+2005-04-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmain.c (g_child_watch_source_new): Add a note regarding
+	waitpid(-1).
+	(g_child_watch_source_init_multi_threaded): 
+	(g_child_watch_source_init_single): Don't use SA_RESTART,
+	since it causes problems on at least one platform. (#168352)
+
 2005-03-31  Steve Murphy  <murf@e-tools.com>
 
-        * configure.in: Added "rw" to ALL_LINGUAS.
+	* configure.in: Added "rw" to ALL_LINGUAS.
 
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ffbca8d31..c5ce3c239 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,6 +1,14 @@
+2005-04-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmain.c (g_child_watch_source_new): Add a note regarding
+	waitpid(-1).
+	(g_child_watch_source_init_multi_threaded): 
+	(g_child_watch_source_init_single): Don't use SA_RESTART,
+	since it causes problems on at least one platform. (#168352)
+
 2005-03-31  Steve Murphy  <murf@e-tools.com>
 
-        * configure.in: Added "rw" to ALL_LINGUAS.
+	* configure.in: Added "rw" to ALL_LINGUAS.
 
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ffbca8d31..c5ce3c239 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,14 @@
+2005-04-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmain.c (g_child_watch_source_new): Add a note regarding
+	waitpid(-1).
+	(g_child_watch_source_init_multi_threaded): 
+	(g_child_watch_source_init_single): Don't use SA_RESTART,
+	since it causes problems on at least one platform. (#168352)
+
 2005-03-31  Steve Murphy  <murf@e-tools.com>
 
-        * configure.in: Added "rw" to ALL_LINGUAS.
+	* configure.in: Added "rw" to ALL_LINGUAS.
 
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
diff --git a/glib/gmain.c b/glib/gmain.c
index 4cc320b60..4d262e26f 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -3565,7 +3565,7 @@ g_child_watch_source_init_single (void)
 
   action.sa_handler = g_child_watch_signal_handler;
   sigemptyset (&action.sa_mask);
-  action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
+  action.sa_flags = SA_NOCLDSTOP;
   sigaction (SIGCHLD, &action, NULL);
 }
 
@@ -3674,6 +3674,11 @@ g_child_watch_source_init (void)
  * (see g_spawn_close_pid()) @pid must not be closed while the
  * source is still active. Typically, you will want to call
  * 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 
+ * the application. Calling waitpid() for individual pids will
+ * still work fine. 
  * 
  * Return value: the newly-created child watch source
  *