diff --git a/gio/ChangeLog b/gio/ChangeLog
index e7f0e3f8c..9c5a7784d 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Merge from trunk
+
+	Bug 547080 – g_file_copy leaks expected errors
+
+	* gfile.c: (g_file_copy): Clear G_IO_ERROR_NOT_SUPPORTED
+	errors before trying the next fallback routine. Patch by
+	Felix Riemann
+
 2008-09-11  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk
diff --git a/gio/gfile.c b/gio/gfile.c
index 8531a7fa3..7406a65a8 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -2381,6 +2381,8 @@ g_file_copy (GFile                  *source,
 	  g_propagate_error (error, my_error);
 	      return FALSE;
 	}
+      else
+	g_clear_error (&my_error);
     }
 
   /* If the types are different, and the destination method failed
@@ -2405,6 +2407,8 @@ g_file_copy (GFile                  *source,
 	      g_propagate_error (error, my_error);
 	      return FALSE;
 	    }
+	  else
+	    g_clear_error (&my_error);
 	}
     }