diff --git a/evolution.spec b/evolution.spec
index 1073dae..16435fc 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -300,6 +300,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
 # remove statically built libraries:
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
 
+# remove old GConf schemas
+find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \;
+
 # remove additional things we don't want
 %if ! %{inline_audio_support}
 %{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \
@@ -320,89 +323,21 @@ rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop
 grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang
 
-%pre
-if [ "$1" -gt 1 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
-fi
-
-%pre bogofilter
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
-
-%pre spamassassin
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
-
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
-
-%post bogofilter
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
-
-%post spamassassin
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
-
-%preun
-if [ "$1" -eq 0 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
-fi
-
-%preun bogofilter
-if [ "$1" -eq 0 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
-fi
-
-%preun spamassassin
-if [ "$1" -eq 0 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
-fi
-
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -411,17 +346,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 
-# GConf schemas:
-%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
-%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
-%{_sysconfdir}/gconf/schemas/evolution-mail.schemas
+# GSettings schemas:
+%{_datadir}/GConf/gsettings/evolution.convert
+
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 
 # The main executable
 %{_bindir}/evolution
@@ -454,6 +396,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so
@@ -624,7 +567,7 @@ rm -rf $RPM_BUILD_ROOT
 %files bogofilter
 %defattr(-, root, root)
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so
-%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 
 %files NetworkManager
 %defattr(-, root, root)
@@ -633,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT
 %files spamassassin
 %defattr(-, root, root)
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so
-%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 %files perl
 %defattr(-, root, root)