diff --git a/totem.spec b/totem.spec
index 6e592e9..33a45dd 100644
--- a/totem.spec
+++ b/totem.spec
@@ -1,17 +1,13 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.91.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.90/totem-%{version}.tar.bz2
 
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
-
 Requires: iso-codes
 Requires: gnome-icon-theme
 # For the opensubtitles plugin
@@ -24,7 +20,7 @@ Requires: python-BeautifulSoup
 Requires: python-feedparser
 
 Requires: gstreamer
-Requires: gstreamer-plugins-base 
+Requires: gstreamer-plugins-base
 Requires: gstreamer-plugins-good
 Requires: gstreamer-plugins-bad-free
 Requires: gvfs-fuse
@@ -33,7 +29,7 @@ Requires: gnome-dvb-daemon
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: gstreamer-plugins-good
-BuildRequires: liboil 
+BuildRequires: liboil
 BuildRequires: libpeas-devel
 
 BuildRequires: gcc-c++, pkgconfig, gettext
@@ -61,7 +57,6 @@ BuildRequires: liberation-sans-fonts
 
 # For plugins
 BuildRequires: lirc-devel
-BuildRequires: gmyth-devel
 #BuildRequires: tracker-devel
 BuildRequires: libepc-devel
 BuildRequires: libgdata-devel
@@ -125,6 +120,9 @@ 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,
@@ -195,7 +193,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget.so \
- $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/
+ $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/ \
+ $RPM_BUILD_ROOT%{_libdir}/totem/plugins/mythtv/
 
 %find_lang %{name} --with-gnome
 
@@ -221,14 +220,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post
 update-desktop-database &> /dev/null || :
-%gconf_schema_upgrade totem totem-handlers totem-video-thumbnail
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %pre
-%gconf_schema_prepare totem totem-handlers totem-video-thumbnail
 
 %preun
-%gconf_schema_remove totem totem-handlers totem-video-thumbnail
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun
@@ -242,15 +238,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%pre mythtv
-%gconf_schema_prepare totem-mythtv
-
-%preun mythtv
-%gconf_schema_remove totem-mythtv
-
-%post mythtv
-%gconf_schema_upgrade totem-mythtv
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
@@ -337,6 +324,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Thu Nov 11 2010 Bastien Nocera <bnocera@redhat.com> 2.91.0-2
+- Remove GConf schemas scripts
+- Remove mythtv sub-package, was removed upstream
+
 * Tue Nov 02 2010 Bastien Nocera <bnocera@redhat.com> 2.91.0-1
 - Update to 2.91.0