diff --git a/gio/ChangeLog b/gio/ChangeLog
index b3a48c602..2663e8033 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-07  Alexander Larsson  <alexl@redhat.com>
+
+	* gunixinputstream.c (g_unix_input_stream_skip_finish):
+	Fix warning (#507835)
+
 2008-01-07  Alexander Larsson  <alexl@redhat.com>
 
         * Makefile.am:
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 5e4c09028..ab47ec680 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -379,6 +379,7 @@ g_unix_input_stream_skip_finish  (GInputStream  *stream,
 				  GError       **error)
 {
   g_warn_if_reached ();
+  return 0;
   /* TODO: Not implemented */
 }