diff --git a/gio/ChangeLog b/gio/ChangeLog
index 355ecbced..d1b07239f 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+
+	Backported from trunk:
+
+	* gfile.c (g_file_replace_contents): do not leak the output stream.
+
 2008-06-30 Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
diff --git a/gio/gfile.c b/gio/gfile.c
index 60b44af34..a240688d9 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -5399,6 +5399,7 @@ g_file_replace_contents (GFile             *file,
     {
       /* Ignore errors on close */
       g_output_stream_close (G_OUTPUT_STREAM (out), cancellable, NULL);
+      g_object_unref (out);
       
       /* error is set already */
       return FALSE;
@@ -5410,6 +5411,8 @@ g_file_replace_contents (GFile             *file,
   if (new_etag)
     *new_etag = g_file_output_stream_get_etag (out);
   
+  g_object_unref (out);
+
   return TRUE;
 }