diff --git a/ChangeLog b/ChangeLog
index e743a93e31..4f9c3f58e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-11  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gst.c: (ensure_current_registry_forking):
+	  Check return value of write() to make compiler happy.
+
 2006-10-11  Wim Taymans  <wim@fluendo.com>
 
 	Patch by: Sjoerd Simons <sjoerd at luon dot net>
diff --git a/gst/gst.c b/gst/gst.c
index 9e92bf0da7..554b4da2df 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -303,8 +303,8 @@ gst_init_get_option_group (void)
               "GST_AUTOPLUG:5,GST_ELEMENT_*:3"),
         N_("LIST")},
     {"gst-debug-no-color", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
-        (gpointer) parse_goption_arg, N_("Disable colored debugging output"),
-          NULL},
+          (gpointer) parse_goption_arg, N_("Disable colored debugging output"),
+        NULL},
     {"gst-debug-disable", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
         (gpointer) parse_goption_arg, N_("Disable debugging"), NULL},
 #endif
@@ -738,7 +738,9 @@ ensure_current_registry_forking (GstRegistry * default_registry,
 
     /* write a result byte to the pipe */
     res_byte = res ? '1' : '0';
-    write (pfd[1], &res_byte, 1);
+    if (write (pfd[1], &res_byte, 1) != 1 || close (pfd[1]) != 0) {
+      /* could not write to pipe, probably means parent has exited before us */
+    }
     _exit (0);
   } else {
     int ret;