diff --git a/.gitignore b/.gitignore
index 7ff9a2c..570f2aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ totem-2.90.5.tar.bz2
 /totem-3.0.0.tar.bz2
 /totem-3.0.1.tar.bz2
 /totem-3.1.0.tar.bz2
+/totem-3.1.4.tar.bz2
diff --git a/sources b/sources
index a56cde7..f0207dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-688f110708cc908194f9b25bd9fb5c52  totem-3.1.0.tar.bz2
+a04f9c12da4729d4774a73be832ac1e1  totem-3.1.4.tar.bz2
diff --git a/totem.spec b/totem.spec
index 867dc68..d89bc98 100644
--- a/totem.spec
+++ b/totem.spec
@@ -1,12 +1,12 @@
 Summary: Movie player for GNOME
 Name: totem
-Version: 3.1.0
-Release: 2%{?dist}
+Version: 3.1.4
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
-Source0: http://download.gnome.org/sources/totem/3.1.0/totem-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/totem/3.1/totem-%{version}.tar.bz2
 
 Requires: gnome-icon-theme
 # For the opensubtitles plugin
@@ -25,6 +25,7 @@ Requires: gstreamer-plugins-good
 Requires: gstreamer-plugins-bad-free
 Requires: gvfs-fuse
 Requires: gnome-dvb-daemon
+Requires: grilo-plugins
 
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
@@ -53,9 +54,29 @@ BuildRequires: liberation-sans-fonts
 
 # For plugins
 BuildRequires: lirc-devel
-#BuildRequires: tracker-devel
-BuildRequires: libepc-devel
 BuildRequires: libgdata-devel
+BuildRequires: grilo-devel
+
+# The mythtv sub-package was removed
+# (obsoleted by -upnp then by grilo in main)
+Obsoletes: totem-mythtv < 1:2.91.0-1
+Provides: totem-mythtv = %{epoch}:%{version}-%{release}
+# The upnp sub-package was removed
+# (obsoleted by the grilo plugin)
+Obsoletes: totem-upnp < 1:3.1.4-1
+Provides: totem-upnp = %{epoch}:%{version}-%{release}
+# The jamendo sub-package was removed
+# (obsoleted by the grilo plugin)
+Obsoletes: totem-jamendo < 1:3.1.4-1
+Provides: totem-jamendo = %{epoch}:%{version}-%{release}
+# The tracker sub-package was removed
+# (obsoleted by the grilo plugin)
+Obsoletes: totem-tracker < 1:3.1.4-1
+Provides: totem-tracker = %{epoch}:%{version}-%{release}
+# The publish sub-package was removed
+# (obsoleted by nothing)
+Obsoletes: totem-publish < 1:3.1.4-1
+Provides: totem-publish = %{epoch}:%{version}-%{release}
 
 %description
 Totem is simple movie player for the GNOME desktop. It features a
@@ -92,47 +113,6 @@ and watching them.
 To play back the videos however, you will need codecs that are not
 available in the Fedora repositories.
 
-%package jamendo
-Summary: Jamendo plugin for Totem
-Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description jamendo
-This package provides a plugin to allow browsing the Jamendo music store
-in Totem, and listening to them.
-
-%package upnp
-Summary: UPNP/DLNA plugin for Totem
-Group: Applications/Multimedia
-Requires: python-Coherence
-Requires: %{name} = %{epoch}:%{version}-%{release}
-# The mythtv sub-package was removed
-Obsoletes: totem-mythtv < 1:2.91.0-1
-Provides: totem-mythtv = %{epoch}:%{version}-%{release}
-
-%description upnp
-This package provides a plugin to allow browsing UPNP/DLNA shares,
-and watching videos from those.
-
-#%package tracker
-#Summary: Tracker-based video search plugin for Totem
-#Group: Applications/Multimedia
-#Requires: %{name} = %{version}-%{release}
-
-#%description tracker
-#This package provides a Totem plugin to allow searching local videos, based
-#on their tags, metadata, or filenames, as indexing by the Tracker indexer.
-
-%package publish
-Summary: Share your playlist with other Totems on the local network
-Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description publish
-This package provides 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 devel
 Summary: Plugin writer's documentation for totem
 Group: Development/Libraries
@@ -246,6 +226,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/totem/plugins/chapters
 %{_libdir}/totem/plugins/dbus
 %{_libdir}/totem/plugins/gromit
+%{_libdir}/totem/plugins/grilo
 %{_libdir}/totem/plugins/iplayer
 %{_libdir}/totem/plugins/im-status
 %{_libdir}/totem/plugins/ontop
@@ -279,14 +260,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %defattr(-, root, root,-)
 %{_libdir}/totem/plugins/youtube
 
-%files jamendo
-%defattr(-, root, root,-)
-%{_libdir}/totem/plugins/jamendo
-
-%files upnp
-%defattr(-, root, root,-)
-#%{_libdir}/totem/plugins/coherence_upnp
-
 %files devel
 %defattr(-, root, root,-)
 %{_datadir}/gtk-doc/html/totem
@@ -295,10 +268,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/pkgconfig/totem.pc
 %{_datadir}/gir-1.0/Totem-1.0.gir
 
-#%files tracker
-#%defattr(-, root, root)
-#%{_libdir}/totem/plugins/tracker
-
 %files mozplugin
 %defattr(-, root, root,-)
 %{_libdir}/mozilla/plugins/*
@@ -306,11 +275,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/totem/mozilla-viewer.ui
 %{_datadir}/totem/mozilla-viewer.css
 
-%files publish
-%defattr(-, root, root,-)
-%{_libdir}/totem/plugins/publish
-
 %changelog
+* Wed Aug 03 2011 Bastien Nocera <bnocera@redhat.com> 3.1.4-1
+- Update to 3.1.4
+- Remove obsoleted plugins
+
 * Mon Jun 27 2011 Elad Alfassa <elad@fedoraproject.org> - 1:3.1.0-2
 - Moved mozilla-viewer.ui to -mozplugin to fix bug #545131