diff --git a/defaults.list b/defaults.list
index c6b0832..dd2f2bd 100644
--- a/defaults.list
+++ b/defaults.list
@@ -1,8 +1,8 @@
 [Default Applications]
 application/x-dia-diagram=fedora-dia.desktop
-#text/x-vcard=evolution-2.0.desktop
-#text/x-vcalendar=evolution-2.0.desktop
-#text/calendar=evolution-2.0.desktop
+#text/x-vcard=evolution.desktop
+#text/x-vcalendar=evolution.desktop
+#text/calendar=evolution.desktop
 application/x-arj=gnome-file-roller.desktop
 application/x-bzip-compressed-tar=gnome-file-roller.desktop
 application/x-bzip=gnome-file-roller.desktop
@@ -108,3 +108,7 @@ 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
+# URI scheme handlers
+x-scheme-handler/mailto=evolution.desktop
+x-scheme-handler/http=mozilla-firefox.desktop
+x-scheme-handler/https=mozilla-firefox.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index afb680d..39978bc 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,14 +1,14 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
 Source0: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
 Source1: defaults.list
 # Generated with:
-# for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q $i ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi  ; done
+# for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q "$i;" ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi ; done ; for i in `cat /home/hadess/Projects/jhbuild/totem/data/uri-schemes-list.txt | grep -v ^#` ; do echo "x-scheme-handler/$i=totem.desktop;" >> totem-defaults.list ; done
 Source2: totem-defaults.list
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* 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
+  Evolution and Firefox
+
 * Wed Dec 01 2010 Bastien Nocera <bnocera@redhat.com> 0.90-1
 - Update to 0.90
 
diff --git a/totem-defaults.list b/totem-defaults.list
index 3810358..6aea48b 100644
--- a/totem-defaults.list
+++ b/totem-defaults.list
@@ -23,11 +23,13 @@ audio/AMR=totem.desktop;
 audio/AMR-WB=totem.desktop;
 audio/basic=totem.desktop;
 audio/midi=totem.desktop;
+audio/mp2=totem.desktop;
 audio/mp4=totem.desktop;
 audio/mpeg=totem.desktop;rhythmbox.desktop;
 audio/mpegurl=totem.desktop;
 audio/ogg=totem.desktop;
 audio/prs.sid=totem.desktop;
+audio/x-aiff=totem.desktop;
 audio/x-ape=totem.desktop;
 audio/x-flac=totem.desktop;rhythmbox.desktop;
 audio/x-gsm=totem.desktop;
@@ -53,7 +55,7 @@ audio/x-speex=totem.desktop;
 audio/x-tta=totem.desktop;
 audio/x-wav=totem.desktop;
 audio/x-wavpack=totem.desktop;
-audio/x-vorbis=totem.desktop;rhythmbox.desktop;
+audio/x-vorbis=totem.desktop;
 audio/x-vorbis+ogg=totem.desktop;rhythmbox.desktop;
 audio/x-xm=totem.desktop;
 image/x-pict=totem.desktop;
@@ -64,6 +66,7 @@ video/3gpp=totem.desktop;
 video/dv=totem.desktop;
 video/fli=totem.desktop;
 video/flv=totem.desktop;
+video/mp2t=totem.desktop;
 video/mp4=totem.desktop;
 video/mp4v-es=totem.desktop;
 video/mpeg=totem.desktop;
@@ -73,6 +76,7 @@ video/quicktime=totem.desktop;
 video/vivo=totem.desktop;
 video/vnd.divx=totem.desktop;
 video/vnd.vivo=totem.desktop;
+video/webm=totem.desktop;
 video/x-anim=totem.desktop;
 video/x-avi=totem.desktop;
 video/x-flc=totem.desktop;
@@ -93,3 +97,12 @@ video/x-nsv=totem.desktop;
 video/x-ogm+ogg=totem.desktop;
 video/x-theora+ogg=totem.desktop;
 video/x-totem-stream=totem.desktop;
+x-scheme-handler/pnm=totem.desktop;
+x-scheme-handler/mms=totem.desktop;
+x-scheme-handler/net=totem.desktop;
+x-scheme-handler/rtp=totem.desktop;
+x-scheme-handler/rtsp=totem.desktop;
+x-scheme-handler/mmsh=totem.desktop;
+x-scheme-handler/uvox=totem.desktop;
+x-scheme-handler/icy=totem.desktop;
+x-scheme-handler/icyx=totem.desktop;