diff --git a/defaults.list b/defaults.list
index dd2f2bd..f4402d7 100644
--- a/defaults.list
+++ b/defaults.list
@@ -93,6 +93,7 @@ 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
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 39978bc..6caecef 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: 2%{?dist}
+Release: 3%{?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
+* Tue Dec 07 2010 Bastien Nocera <bnocera@redhat.com> 0.90-3
+- Add Firefox as the default for application/xhtml+xml
+  (#660657)
+
 * Wed Dec 01 2010 Bastien Nocera <bnocera@redhat.com> 0.90-2
 - Update list of defaults, adding new mime-types for Totem,
   as well as scheme handlers, and install defaults for