diff --git a/defaults.list b/defaults.list
index f27a3cf..abe504a 100644
--- a/defaults.list
+++ b/defaults.list
@@ -3,7 +3,7 @@ application/x-dia-diagram=fedora-dia.desktop
 text/x-vcard=evolution.desktop
 text/directory=evolution.desktop
 text/calendar=evolution.desktop
-application/x-cd-image=mount-archive.desktop
+application/x-cd-image=gnome-disk-image-mounter.desktop
 image/x-compressed-xcf=gimp.desktop
 image/x-xcf=gimp.desktop
 image/x-psd=gimp.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index f1191b5..90ec279 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: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -87,6 +87,10 @@ sed -i -e 's|mozilla-firefox.desktop|firefox.desktop|'\
 %{_mandir}/man*/*
 
 %changelog
+* Fri May 11 2012 Bastien Nocera <bnocera@redhat.com> 1.0-3
+- Use gnome-disk-image-mounter from gnome-disk-utility to handle
+  CD images by default (#820403)
+
 * Wed Mar  7 2012 Matthias Clasen <mclasen@redhat.com> - 1.0-2
 - Own/%%ghost files generated by update-mime-database from
   freedesktop.org.xml (patch by Ville Skyttä)