diff --git a/.cvsignore b/.cvsignore
index 5d40783..8fc90d6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-totem-2.21.90.tar.bz2
+totem-2.21.91.tar.bz2
diff --git a/sources b/sources
index 87ad4cc..1d46d4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34beac7074c76d617d01559d8b59e589  totem-2.21.90.tar.bz2
+6071b61bd9db46fc9dfe960e2673ab59  totem-2.21.91.tar.bz2
diff --git a/totem.spec b/totem.spec
index 52e8389..19412ee 100644
--- a/totem.spec
+++ b/totem.spec
@@ -6,8 +6,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.21.90
-Release: 2%{?dist} 
+Version: 2.21.91
+Release: 1%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -62,8 +62,6 @@ Obsoletes: nautilus-media
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=458324
 Patch0: totem-xul-4.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=510320
-Patch1: x-content.patch
 
 %description
 Totem is simple movie player for the Gnome desktop. It features a
@@ -137,11 +135,19 @@ Requires: %{name} = %{version}-%{release}
 A plugin to allow you to share your current playlist (and the files included
 in that playlist) with other Totems on the same local network.
 
+%package nautilus
+Summary: Video and Audio Properties tab for Nautilus
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description nautilus
+A Nautilus extension that shows the properties of audio and video files in
+the properties dialogue.
+
 %prep
 %setup -q
 
 %patch0 -p0 -b .xulrunner
-%patch1 -p1 -b .x-content
 automake
 autoconf
 
@@ -250,7 +256,6 @@ fi
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
-%{_libdir}/nautilus/extensions-*/*.so*
 %dir %{_libdir}/totem/plugins
 %{_libdir}/totem/plugins/gromit
 %{_libdir}/totem/plugins/ontop
@@ -298,7 +303,15 @@ fi
 %defattr(-, root, root)
 %{_libdir}/totem/plugins/publish
 
+%files nautilus
+%defattr(-, root, root)
+%{_libdir}/nautilus/extensions-*/*.so*
+
 %changelog
+* Fri Jan 25 2008 - Bastien Nocera <bnocera@redhat.com> - 2.21.91-1
+- Update to 2.21.91
+- Split out the nautilus extension (#427832)
+
 * Fri Jan 18 2008  Matthias Clasen <mclasen@redhat.com> - 2.21.90-2
 - Add content-type support
 
diff --git a/x-content.patch b/x-content.patch
deleted file mode 100644
index 1c1aaf0..0000000
--- a/x-content.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up totem-2.21.90/data/mime-type-list.txt.x-content totem-2.21.90/data/mime-type-list.txt
---- totem-2.21.90/data/mime-type-list.txt.x-content	2008-01-18 01:12:06.000000000 -0500
-+++ totem-2.21.90/data/mime-type-list.txt	2008-01-18 01:12:33.000000000 -0500
-@@ -89,3 +89,8 @@ video/x-ms-wvx
- video/x-nsv
- video/x-ogm+ogg
- video/x-theora+ogg
-+x-content/video-dvd
-+x-content/video-vcd
-+x-content/video-svcd
-+x-content/video-blueray
-+x-content/video-hddvd