diff --git a/gvfs-1.0.2-no-generic-icons.patch b/gvfs-1.0.2-no-generic-icons.patch
new file mode 100644
index 0000000..56f2e76
--- /dev/null
+++ b/gvfs-1.0.2-no-generic-icons.patch
@@ -0,0 +1,48 @@
+Index: daemon/gvfsbackendsftp.c
+===================================================================
+--- daemon/gvfsbackendsftp.c	(revision 2074)
++++ daemon/gvfsbackendsftp.c	(revision 2075)
+@@ -1804,11 +1804,7 @@ parse_attributes (GVfsBackendSftp *backe
+           if (S_ISDIR(mode))
+             icon = g_themed_icon_new ("folder");
+           else if (mimetype)
+-            {
+               icon = g_content_type_get_icon (mimetype);
+-              if (G_IS_THEMED_ICON (icon))
+-                g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
+-            }
+ 
+           if (icon == NULL)
+             icon = g_themed_icon_new ("text-x-generic");
+Index: daemon/gvfsbackendsmb.c
+===================================================================
+--- daemon/gvfsbackendsmb.c	(revision 2074)
++++ daemon/gvfsbackendsmb.c	(revision 2075)
+@@ -1381,13 +1381,8 @@ set_info_from_stat (GVfsBackendSmb *back
+       else
+ 	{
+ 	  content_type = g_content_type_guess (basename, NULL, 0, NULL);
+-	  
+ 	  if (content_type)
+-	    {
+-              icon = g_content_type_get_icon (content_type);
+-              if (G_IS_THEMED_ICON (icon))
+-                g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
+-	    }
++	    icon = g_content_type_get_icon (content_type);
+ 	}
+       
+       if (content_type)
+Index: daemon/gvfsdaemonutils.c
+===================================================================
+--- daemon/gvfsdaemonutils.c	(revision 2074)
++++ daemon/gvfsdaemonutils.c	(revision 2075)
+@@ -276,8 +276,6 @@ gvfs_file_info_populate_content_types (G
+   else
+     {
+       icon = g_content_type_get_icon (mimetype);
+-      if (G_IS_THEMED_ICON (icon))
+-	g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
+     }
+   
+   g_file_info_set_icon (info, icon);
diff --git a/gvfs.spec b/gvfs.spec
index 5b2f558..9af6c0e 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: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -35,6 +35,10 @@ Patch2: gvfs-obexftp-updated-apis-3.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=530654
 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
+
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -118,6 +122,7 @@ media players (Media Transfer Protocol) to applications using gvfs.
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .bluez-ods
 %patch4 -p1 -b .reverse-map-fuse-paths.patch
+%patch5 -p0 -b .no-generic-icons
 
 %build
 
@@ -255,6 +260,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* 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)
+
 * Mon Oct 20 2008 Tomas Bzatek <tbzatek@redhat.com> - 1.0.2-1
 - Update to 1.0.2