diff --git a/gio/ChangeLog b/gio/ChangeLog
index deb156cdb..6c2c067e0 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09  Alexander Larsson  <alexl@redhat.com>
+
+	* gunixinputstream.c (g_unix_input_stream_read):
+	Actually return -1 in case of cancelled, not old res value.
+
 2008-10-05  Pascal Terjan  <pterjan@linuxfr.org>
 
 	Bug 554970 – segfault when update-desktop-database is not available
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 98280cdff..f7c87693b 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -207,7 +207,7 @@ g_unix_input_stream_read (GInputStream  *stream,
   while (1)
     {
       if (g_cancellable_set_error_if_cancelled (cancellable, error))
-	break;
+	return -1;
       res = read (unix_stream->priv->fd, buffer, count);
       if (res == -1)
 	{