diff --git a/gvfs-1.0.2-guess_content_type.patch b/gvfs-1.0.2-guess_content_type.patch
new file mode 100644
index 0000000..6b617db
--- /dev/null
+++ b/gvfs-1.0.2-guess_content_type.patch
@@ -0,0 +1,18 @@
+Index: client/gdaemonmount.c
+===================================================================
+--- client/gdaemonmount.c	(revision 2080)
++++ client/gdaemonmount.c	(working copy)
+@@ -366,11 +366,12 @@
+   GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount);
+   char **result;
+ 
+-  result = NULL;
+   G_LOCK (daemon_mount);
+   if (daemon_mount->mount_info->x_content_types != NULL &&
+       strlen (daemon_mount->mount_info->x_content_types) > 0)
+     result = g_strsplit (daemon_mount->mount_info->x_content_types, " ", 0);
++  else
++    result = g_new0 (char *, 1);
+   G_UNLOCK (daemon_mount);
+ 
+   return result;
diff --git a/gvfs.spec b/gvfs.spec
index 9af6c0e..3ed33b1 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -38,6 +38,8 @@ Patch4: gvfs-1.1.1-reverse-map-fuse-paths.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=528320 (from svn)
 Patch5: gvfs-1.0.2-no-generic-icons.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=468946
+Patch6: gvfs-1.0.2-guess_content_type.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -123,6 +125,7 @@ media players (Media Transfer Protocol) to applications using gvfs.
 %patch2 -p0 -b .bluez-ods
 %patch4 -p1 -b .reverse-map-fuse-paths.patch
 %patch5 -p0 -b .no-generic-icons
+%patch6 -p0 -b .guess-content-type
 
 %build
 
@@ -260,6 +263,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Nov  4 2008 Tomas Bzatek <tbzatek@redhat.com> - 1.0.2-3
+- Return an empty array on success when no content type
+  matches (#468946)
+
 * Fri Oct 24 2008 Alexander Larsson <alexl@redhat.com> - 1.0.2-2
 - Don't return generic fallback icons for files,
   as this means custom mimetypes don't work (from svn)