diff --git a/gio/ChangeLog b/gio/ChangeLog
index d1b07239f..194d48c4e 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+
+	Backported from trunk:
+
+	Bug 528600 – g_dummy_file_get_parent("scheme://example.com/")
+
+	* gdummyfile.c (g_dummy_file_get_parent): Return NULL if there
+	is no parent.  (Owen Taylor, patch by Christian Neumair)
+
 2008-06-30 Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
diff --git a/gio/gdummyfile.c b/gio/gdummyfile.c
index 2287674db..1fa0aeda9 100644
--- a/gio/gdummyfile.c
+++ b/gio/gdummyfile.c
@@ -172,7 +172,8 @@ g_dummy_file_get_parent (GFile *file)
   char *uri;
   GDecodedUri new_decoded_uri;
 
-  if (dummy->decoded_uri == NULL)
+  if (dummy->decoded_uri == NULL ||
+      g_strcmp0 (dummy->decoded_uri->path, "/") == 0)
     return NULL;
 
   dirname = g_path_get_dirname (dummy->decoded_uri->path);