diff --git a/defaults.list b/defaults.list
index f4402d7..0932549 100644
--- a/defaults.list
+++ b/defaults.list
@@ -84,21 +84,21 @@ application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop
 application/x-gnucash=gnome-gnucash.desktop
-application/vnd.lotus-1-2-3=gnome-gnumeric.desktop
-application/x-oleo=gnome-gnumeric.desktop
-application/x-gnumeric=gnome-gnumeric.desktop
-application/x-xbase=gnome-gnumeric.desktop
-application/x-abiword=gnome-abiword.desktop
+application/vnd.lotus-1-2-3=fedora-gnumeric.desktop
+application/x-oleo=fedora-gnumeric.desktop
+application/x-gnumeric=fedora-gnumeric.desktop
+application/x-xbase=fedora-gnumeric.desktop
+application/x-abiword=fedora-abiword.desktop
 application/x-dvi=evince.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gedit.desktop
 text/html=mozilla-firefox.desktop
 application/xhtml+xml=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
-x-content/blank-cd=brasero-ncb.desktop
-x-content/blank-dvd=brasero-ncb.desktop
-x-content/blank-bd=brasero-ncb.desktop
-x-content/blank-hddvd=brasero-ncb.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop
@@ -107,8 +107,8 @@ x-content/video-svcd=totem.desktop
 x-content/audio-cdda=rhythmbox.desktop
 x-content/audio-dvd=rhythmbox.desktop
 x-content/audio-player=rhythmbox.desktop
-x-content/image-dcf=gthumb-importer.desktop
-x-content/image-picturecd=gthumb-importer.desktop
+x-content/image-dcf=gthumb-import.desktop
+x-content/image-picturecd=gthumb-import.desktop
 # URI scheme handlers
 x-scheme-handler/mailto=evolution.desktop
 x-scheme-handler/http=mozilla-firefox.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 6caecef..df136ed 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Wed Dec 08 2010 Bastien Nocera <bnocera@redhat.com> 0.90-4
+- Update defaults.list and update for newer desktop names,
+  with help from Edward Sheldrake (#659457)
+
 * Tue Dec 07 2010 Bastien Nocera <bnocera@redhat.com> 0.90-3
 - Add Firefox as the default for application/xhtml+xml
   (#660657)