diff --git a/evolution-3.4.4.tar.xz b/evolution-3.4.4.tar.xz
deleted file mode 100644
index a30b536..0000000
--- a/evolution-3.4.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a
-size 11899620
diff --git a/evolution-3.6.0.tar.xz b/evolution-3.6.0.tar.xz
new file mode 100644
index 0000000..eae1c6c
--- /dev/null
+++ b/evolution-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6163ef56a22ca7c605a89d774851c9988d7840a4dc5c73c546308e5380cfe7b4
+size 12021428
diff --git a/evolution.changes b/evolution.changes
index a1ac17f..2a72c43 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,249 @@
+-------------------------------------------------------------------
+Sun Sep 23 09:45:37 UTC 2012 - coolo@suse.com
+
+- Replace ';' with 'and' in license tag.
+
+-------------------------------------------------------------------
+Sun Sep 23 09:39:03 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 3.6.0:
+  + WebKit renders frames with plain/text parts too small
+    (bgo#678408).
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Sep 16 20:58:04 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.92:
+  + Honor CAMEL_PROVIDER_DISABLE_SENT_FOLDER in account preferences
+  + Blacklist WebKitGTK+ 1.9.90.
+  + Make sure selection in ECalendar is visible
+  + Make sure the selected days in the calendar matches shown days
+  + Autocompletion in meeting editor doesn't work
+  + Could not set custom port for LDAP addressbook
+  + Fails to import calendar events due to used incorrect enum
+    values
+  + Bugs fixed: bgo#678291, bgo#678806, bgo#678835, bgo#679382,
+    bgo#679780, bgo#680537, bgo#680611, bgo#681279, bgo#682295,
+    bgo#682425, bgo#682820, bgo#682873, bgo#683130, bgo#683349,
+    bgo#683407, bgo#683548, bgo#683663, bgo#683665, bgo#683676,
+    bgo#683736, bgo#683758, bgo#683866, bgo#683949, bgo#684021.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Sep  8 09:20:25 UTC 2012 - vuntz@opensuse.org
+
+- Stop passing --enable-mono=yes and --enable-python=yes to
+  configure now that the mono and python plugins are gone.
+- Remove unneeded python-devel BuildRequires, now that there are no
+  python plugins anymore.
+- Replace gnome-doc-utils-devel BuildRequires with yelp-tools since
+  the documentation has been ported to the new build system. Also
+  remove explicit itstool BuildRequires which should not be needed.
+- Re-enable translation-update-upstream: it works.
+- Remove FIXME about enabling clutter for express mode: this
+  feature is gone now.
+
+-------------------------------------------------------------------
+Sun Sep  2 11:17:50 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.91:
+  + cal-config-webcal: Accept URIs with webcal:// scheme
+  + Adjust for webkit 1.9.90 API change
+  + Fix visibility of parts in prefer-plain
+  + Add support for application/ics to ITIP formatter
+  + Make sure evolution-alarm-notify is running on Evolution's
+    start
+  + Support GStreamer 1.0 (bgo#682955)
+  + Various other code changes.
+  + Bugs fixed: bgo#586186, bgo#678476, bgo#679862, bgo#680786,
+    bgo#681431, bgo#681669, bgo#681877, bgo#682494, bgo#682519,
+    bgo#682678, bgo#682811, bgo#682955
+  + Updated translations.
+- Drop evolution-gst10.patch: fixed upstream.
+- Drop evolution-webkit-1_9_90.patch: fixed upstream.
+- Add itstool BuildRequires: new dependency.
+
+-------------------------------------------------------------------
+Wed Aug 29 19:01:43 UTC 2012 - dimstar@opensuse.org
+
+- Add evolution-gst10.patch: Port evolution to GStreamer 1.0.
+- Replace pkgconfig(gstreamer-0.10) BuildRequires with
+  pkgconfig(gstreamer-1.0), enabling the port to GStreamer 1.0.
+
+-------------------------------------------------------------------
+Fri Aug 24 20:40:45 UTC 2012 - dimstar@opensuse.org
+
+- Add evolution-webkit-1_9_90.patch: Fix build with WebKitGTK
+  1.9.90.
+
+-------------------------------------------------------------------
+Sun Aug 19 22:14:42 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90:
+  + User documentation improvements.
+  + Return of the "mark messages as read" preference.
+  + Remove all references to JavaScriptCore and use of JavaScript
+  + Run mbox-to-Maildir conversion before loading modules.
+  + Remove the settings capplet.
+  + express: Remove clutter-based email tabs.
+  + Add event/memo/task "Save As" item to File menu.
+  + Various other code changes.
+  + Bugs fixed: bgo#246530, bgo#555325, bgo#559815, bgo#676785,
+    bgo#677695, bgo#678408, bgo#680702, bgo#680724, bgo#680786,
+    bgo#680947, bgo#681017, bgo#681279, bgo#681318, bgo#681321,
+    bgo#681400, bgo#681432, bgo#681641, bgo#681783, bgo#681882,
+    bgo#682019, bgo#682102
+  + Updated translations.
+- Remove pkgconfig(javascriptcoregtk-3.0) BuildRequires: not needed
+  anymore.
+
+-------------------------------------------------------------------
+Tue Aug 14 14:36:02 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.5.1:
+  + Fix build against WebKitGtk+ 1.9.6 (bgo#681400).
+
+-------------------------------------------------------------------
+Tue Aug 14 14:12:31 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.5:
+  + Various mail formatter and highlighter improvements
+  + Improvements to user documentation
+  + mail-send-recv: Improve presentation
+  + Fix few more memory leaks
+  + Support creating and deleting remote resources
+  + Remove all GDK threads usage
+  + Various other code changes.
+  + Bugs fixed: bgo#677635, bgo#678635, bgo#679049, bgo#679404,
+    bgo#679726, bgo#679843, bgo#680123, bgo#680164, bgo#680331,
+    bgo#680535, bgo#680577, bgo#680634, bgo#680635, bgo#680643,
+    bgo#680666, bgo#680682, bgo#681075.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 14 13:29:19 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.4:
+  + Google:
+    - Remove SSL option for Google Contacts address books
+    - Remove the offline caching option for Google Contacts address
+      book
+  + Fix displaying suppressed HTML parts
+  + Display text/plain in fixed-width font
+  + Fix displaying photos in contacts preview
+  + Display local contact photos in EContactEditor's EImageChooser
+  + Don't load images in preview pane when openning Preferences
+    Dialog
+  + Trust attachments from ~/.kde and ~/.kde4
+  + Use folder display name in status messages when possible.
+  + Add "auto-update" option to Search Folder Editor.
+  + Update to libgweather 3.5
+  + Don't display SMIME signature as an attachment
+  + Make alarm notifications work again
+  + Various other code changes.
+  + Bugs fixed:
+    - bgo#223309: Add "Include Subfolders" to "Search Folder
+      Sources"
+    - bgo#515004: Allow toggling between text and HTML view of mail
+    - bgo#246231, bgo#257283, bgo#332115, bgo#349875, bgo#524737,
+      bgo#548778, bgo#602425, bgo#617557, bgo#653529, bgo#661886,
+      bgo#674427, bgo#677604, bgo#677695, bgo#677885, bgo#677993,
+      bgo#678606, bgo#678667, bgo#678783, bgo#678834, bgo#678946,
+      bgo#679323, bgo#679649, bgo#679726, bgo#679814.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 14 12:22:26 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.3.1:
+  + Numerous missing source files in the 3.5.3 tarball.
+
+-------------------------------------------------------------------
+Tue Aug 14 12:21:00 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.3:
+  + GConf dependency has been dropped.
+  + Account data now resides in plain text files rather than GConf
+    XML blobs.
+  + User documentation improvements.
+  + Remove local mail autoconfiguration data.
+  + Mail formatter rewrite
+  + No more experimental plugins.
+  + Remove Mono and Python EPlugin bindings.
+  + Reduce amount or EMailDisplay reloads when displaying
+    Preferences dialog
+  + Various other code changes.
+  + Bugs fixed: bgo#300677, bgo#431497, bgo#569540, bgo#670876,
+    bgo#674887, bgo#676179, bgo#676563, bgo#677597, bgo#677607,
+    bgo#677608, bgo#677624, bgo#677628, bgo#677631, bgo#677673,
+    bgo#677679, bgo#677686, bgo#677706, bgo#677882, bgo#677995,
+    bgo#678292, bgo#678293, bgo#678304, bgo#678345, bgo#678347,
+    bgo#678393, bgo#678397, bgo#678608, bgo#678609, bgo#678613,
+    bgo#678634, bgo#764467.
+  + Updated translations.
+- Drop pkgconfig(gconf-2.0) BuildRequires and gconf packaging
+  machinery: evolution is now fully ported to GSettings.
+- Disable bnc-435722-book-uri-long.patch: this needs to be rebased,
+  or dropped if not needed anymore.
+- Drop pkgconfig(dbus-glib-1) BuildRequires: no longer needed.
+- Drop mono-plugins and python-plugins subpackages, as they were
+  dropped upstream, add Obsoletes for those packages in the main
+  subpackage.
+- Disable translation-update-upstream.
+
+-------------------------------------------------------------------
+Tue Aug 14 11:11:43 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.2:
+  + Spell checking for 'Summary' in Event/Task/Memo editors.
+  + Make Yahoo! mail-autoconfig use IMAP, instead of POP3 and
+    preconfig also Tasks.
+  + Avoid New unread icon emblem on virtual folders.
+  + Make the settings capplet optional.
+  + Various other code changes.
+  + Bugs fixed:
+    - bgo#246581: "Replies in Sent folder goes to myself"
+    - bgo#200683, bgo#206484, bgo#559710, bgo#669111, bgo#669133,
+      bgo#669295, bgo#669445, bgo#669463, bgo#669657, bgo#669674,
+      bgo#669893, bgo#669983, bgo#671585, bgo#671585, bgo#672827,
+      bgo#673514, bgo#673946, bgo#674997, bgo#675061, bgo#675347,
+      bgo#675391, bgo#675723, bgo#675725, bgo#675728, bgo#675863,
+      bgo#675871, bgo#676226, bgo#676410, bgo#676492, bgo#677045,
+      bgo#677273, bgo#677280.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 14 10:50:03 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.1:
+  + Evolution now uses WebKit/GTK+ instead of GtkHtml to display
+    emails, contacts, tasks and memos. Note that for the time being
+    Evolution still uses GtkHtml to compose emails.
+  + Use GNetworkMonitor to drive EShell:network-available.
+  + Add ability to specify INBOX for non-storage type accounts.
+  + Various other code changes.
+  + Bugs fixed:
+    - bgo#245025: Popup confirmation when moving a folder (via drag
+      and drop)
+    - bgo#528508: Wrap long lines when printing emails
+    - bgo#465076, bgo#560654, bgo#584143, bgo#593444, bgo#593449,
+      bgo#593450, bgo#655753, bgo#668543, bgo#668768, bgo#668769,
+      bgo#668976, bgo#668989, bgo#668998, bgo#670445, bgo#670609,
+      bgo#670967, bgo#670967, bgo#671537, bgo#671874, bgo#671876,
+      bgo#672175, bgo#673013, bgo#673065, bgo#673067, bgo#673108,
+      bgo#673123, bgo#673225, bgo#673228, bgo#673420, bgo#673430,
+      bgo#673525, bgo#674034, bgo#674037, bgo#674060, bgo#674062,
+      bgo#674176, bgo#674194, bgo#674248, bgo#674249, bgo#674272,
+      bgo#674282, bgo#674340, bgo#674380, bgo#674381, bgo#674466,
+      bgo#674701.
+- Drop pkgconfig(NetworkManager) BuildRequires: upstream relies
+  on GNetworkMonitor now.
+- Add pkgconfig(javascriptcoregtk-3.0) and pkgconfig(webkitgtk-3.0)
+  BuildRequires: new dependency to display html mail.
+- Fix pkgconfig(gail) BuildRequires to pkgconfig(gail-3.0), which
+  is really what is wanted.
+
 -------------------------------------------------------------------
 Tue Aug 14 09:05:30 UTC 2012 - dimstar@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 49b4d1c..1973e24 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -23,6 +23,23 @@
 %define need_autogen 0
 
 Name:           evolution
+# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
+%define evolution_base_version 3.6
+Version:        3.6.0
+Release:        0
+# FIXME: check if note on license is still valid (comment before license)
+Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
+License:        LGPL-2.0 and LGPL-3.0
+Group:          Productivity/Networking/Email/Clients
+# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
+Url:            http://gnome.org/projects/evolution/
+Source0:        http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %%{_libdir}/evoldap/include
+Patch15:        evolution-custom-openldap-includes.patch
+# PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM)
+Patch19:        bnc-435722-book-uri-long.patch
+# PATCH-NEEDS-REBASE bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. (was PATCH-FIX-UPSTREAM)
+Patch35:        bnc-210959-evo-accept-ics.patch
 BuildRequires:  bison
 %if %USE_EVOLDAP
 BuildRequires:  evoldap2-devel
@@ -33,72 +50,53 @@ BuildRequires:  fdupes
 %if %USE_EVOLDAP || %{need_autogen}
 BuildRequires:  gnome-common
 %endif
-BuildRequires:  gnome-doc-utils-devel >= 0.20.10
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
 # don't you ever enable this! It's experimental and insecure (bnc#609013)
 #BuildRequires:  libytnef-devel
 BuildRequires:  psmisc
-BuildRequires:  python-devel
 BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(NetworkManager)
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(atk)
-BuildRequires:  pkgconfig(dbus-glib-1) >= 0.6
-BuildRequires:  pkgconfig(gail)
-BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gail-3.0) >= 3.2.0
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gladeui-2.0)
-BuildRequires:  pkgconfig(gnome-desktop-3.0)
-BuildRequires:  pkgconfig(gnome-icon-theme)
-BuildRequires:  pkgconfig(goa-1.0)
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gladeui-2.0) >= 3.10.0
+BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 2.91.3
+BuildRequires:  pkgconfig(gnome-icon-theme) >= 2.30.2.1
+BuildRequires:  pkgconfig(goa-1.0) >= 3.2
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.4.0
+BuildRequires:  pkgconfig(webkitgtk-3.0) >= 1.8.0
 %if %{use_gtkimageview}
 BuildRequires:  pkgconfig(gtkimageview-3.0)
 %endif
-BuildRequires:  pkgconfig(gweather-3.0)
+BuildRequires:  pkgconfig(gweather-3.0) >= 3.5.0
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
-BuildRequires:  pkgconfig(libedataserver-1.2)
-BuildRequires:  pkgconfig(libedataserverui-3.0)
-BuildRequires:  pkgconfig(libgdata)
-BuildRequires:  pkgconfig(libgtkhtml-4.0)
-BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libedataserver-1.2) >= %{version}
+BuildRequires:  pkgconfig(libedataserverui-3.0) >= %{version}
+BuildRequires:  pkgconfig(libgdata) >= 0.10
+BuildRequires:  pkgconfig(libgtkhtml-4.0) >= 4.5.2
+BuildRequires:  pkgconfig(libnotify) >= 0.7
 BuildRequires:  pkgconfig(libpst) >= 0.6.54
-BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.38.1
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.7.3
 BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pangoft2)
-BuildRequires:  pkgconfig(shared-mime-info)
+BuildRequires:  pkgconfig(shared-mime-info) >= 0.22
 BuildRequires:  pkgconfig(sm)
-# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
-%define evolution_base_version 3.4
-Version:        3.4.4
-Release:        0
-# FIXME: check if note on license is still valid (comment before license)
-# FIXME: check with upstream/meego if we want to enable clutter for express mode
-Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
-License:        LGPL-2.0 ; LGPL-3.0
-Group:          Productivity/Networking/Email/Clients
-# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
-Source0:        http://download.gnome.org/sources/evolution/3.4/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
-Patch15:        evolution-custom-openldap-includes.patch
-# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
-Patch19:        bnc-435722-book-uri-long.patch
-# PATCH-NEEDS-REBASE bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. (was PATCH-FIX-UPSTREAM)
-Patch35:        bnc-210959-evo-accept-ics.patch
-Url:            http://gnome.org/projects/evolution/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       evolution-data-server
 Recommends:     %{name}-lang
 Recommends:     bogofilter
+# Mono and python plugins were available until evo 3.5.x
+Obsoletes:      evolution-mono-plugins < %{version}
+Obsoletes:      evolution-python-plugins < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
-%gconf_schemas_prereq
 
 %description
 Evolution consists of modular components (at the moment: mailer,
@@ -133,45 +131,6 @@ Obsoletes:      evolution2-devel < %{version}
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-%package mono-plugins
-Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
-Group:          Productivity/Networking/Email/Clients
-Requires:       evolution = %{version}
-Supplements:    packageand(evolution:mono-core)
-BuildRequires:  evolution-sharp
-BuildRequires:  gconf-sharp2
-BuildRequires:  glib-sharp2
-BuildRequires:  gnome-sharp2
-BuildRequires:  gtk-sharp2
-%if 0%{?suse_version} > 1130
-%if 0%{?suse_version} <= 1140
-# Workaround a bug in mono packaging: the -devel package does not drag in the lib.
-BuildRequires:  libmono-2_0-1
-%endif
-BuildRequires:  pkgconfig(mono-2)
-%else
-BuildRequires:  mono-devel
-%endif
-BuildRequires:  ndesk-dbus-glib-devel
-
-%description mono-plugins
-Evolution consists of modular components (at the moment: mailer,
-calendar, and address book) that should make daily life easier. Because
-of the modular design, it is possible to plug new components into
-Evolution or embed the existing ones in other applications.
-
-%package python-plugins
-Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
-Group:          Productivity/Networking/Email/Clients
-Requires:       evolution = %{version}
-Supplements:    packageand(evolution:python)
-
-%description python-plugins
-Evolution consists of modular components (at the moment: mailer,
-calendar, and address book) that should make daily life easier. Because
-of the modular design, it is possible to plug new components into
-Evolution or embed the existing ones in other applications.
-
 %lang_package
 %prep
 %setup -q
@@ -179,7 +138,8 @@ translation-update-upstream
 %if %USE_EVOLDAP
 %patch15 -p1
 %endif
-%patch19
+# needs-rebase
+#%%patch19
 # needs-rebase
 #%%patch35
 
@@ -197,8 +157,6 @@ NOCONFIGURE=1 gnome-autogen.sh
     --with-krb5=%{_prefix} \
     --enable-nss=yes \
     --enable-smime=yes \
-    --enable-mono=yes \
-    --enable-python=yes \
     --with-glade-catalog \
 %if !%{use_gtkimageview}
     --disable-image-inline \
@@ -206,55 +164,43 @@ NOCONFIGURE=1 gnome-autogen.sh
     --disable-static
 # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
 pushd help
-%{__make}
+make
 popd
 make %{?_smp_flags} V=1
 
 %install
 %{makeinstall}
 %if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 find %{buildroot} -name '*.la' -type f -delete -print
 # Office is okay upstream, but we want the menu item to appear in Internet
 grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.desktop
 %suse_update_desktop_file -r -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution GNOME GTK Network Email Calendar ContactManagement
 %suse_update_desktop_file evolution-alarm-notify
-%suse_update_desktop_file -u evolution-settings
 %find_lang evolution-%evolution_base_version %{?no_lang_C}
 %find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang
-%find_gconf_schemas
-%{__rm} -r %{buildroot}%{_datadir}/mime-info
 %if %USE_EVOLDAP
-  %{__mv} %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin
+  mv %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin
   echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > %{buildroot}%{_bindir}/evolution
-  %{__chmod} +x %{buildroot}%{_bindir}/evolution
+  chmod +x %{buildroot}%{_bindir}/evolution
 %endif
 %fdupes %{buildroot}
 
-%pre -f %{name}.schemas_pre
-
 %post
 %glib2_gsettings_schema_post
 %desktop_database_post
 %icon_theme_cache_post
 
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
 %postun
 %glib2_gsettings_schema_postun
 %desktop_database_postun
 %icon_theme_cache_postun
 
-%files -f %{name}.schemas_list
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
+%doc %{_datadir}/help/C/%{name}/
 %{_bindir}/*
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/applications/*.desktop
@@ -268,51 +214,60 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/*
 %{_libdir}/evolution/*/*.so
-%dir %{_libdir}/evolution/*/modules/
-%{_libdir}/evolution/*/modules/*-module-addressbook.*
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
-%{_libdir}/evolution/*/modules/*-module-bogofilter.*
+%dir %{_libdir}/evolution/%{evolution_base_version}/modules
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-addressbook.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-audio-inline.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-backup-restore.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-bogofilter.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
-%{_libdir}/evolution/*/modules/*-module-calendar.*
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-book-config-google.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-book-config-ldap.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-book-config-local.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-book-config-webdav.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-caldav.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-contacts.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-google.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-local.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-weather.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-cal-config-webcal.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-calendar.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
-%{_libdir}/evolution/*/modules/*-module-composer-autosave.*
-%{_libdir}/evolution/*/modules/*-module-mail.*
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-composer-autosave.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-imap-features.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-itip-formatter.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-mail-config.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-mail.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
-%{_libdir}/evolution/*/modules/*-module-mailto-handler.*
-%{_libdir}/evolution/*/modules/*-module-mdn.*
-%{_libdir}/evolution/*/modules/*-module-network-manager.*
-%{_libdir}/evolution/*/modules/*-module-offline-alert.*
-%{_libdir}/evolution/*/modules/*-module-online-accounts.*
-%{_libdir}/evolution/*/modules/*-module-plugin-lib.*
-%{_libdir}/evolution/*/modules/*-module-plugin-manager.*
-%{_libdir}/evolution/*/modules/*-module-spamassassin.*
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-mailto-handler.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-mdn.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-offline-alert.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-online-accounts.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-plugin-lib.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-plugin-manager.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-prefer-plain.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-spamassassin.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
-%{_libdir}/evolution/*/modules/*-module-startup-wizard.*
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-startup-wizard.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-text-highlight.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/module-vcard-inline.so
+%{_libdir}/evolution/%{evolution_base_version}/modules/*-web-inspector.*
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 %dir %{_libdir}/evolution/*/plugins
-%{_libdir}/evolution/*/plugins/*-addressbook-file.*
-%{_libdir}/evolution/*/plugins/*-backup-restore.*
-%{_libdir}/evolution/*/plugins/*-calendar-file.*
-%{_libdir}/evolution/*/plugins/*-calendar-http.*
-%{_libdir}/evolution/*/plugins/*-calendar-weather.*
-%{_libdir}/evolution/*/plugins/*-default-source.*
 %{_libdir}/evolution/*/plugins/*-email-custom-header.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
 %{_libdir}/evolution/*/plugins/*-evolution-attachment-reminder.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
 %{_libdir}/evolution/*/plugins/*-evolution-bbdb.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
-%{_libdir}/evolution/*/plugins/*-evolution-caldav.*
-%{_libdir}/evolution/*/plugins/*-evolution-google.*
-%{_libdir}/evolution/*/plugins/*-evolution-webdav.*
-%{_libdir}/evolution/*/plugins/*-gnome-audio-inline.*
 %{_libdir}/evolution/*/plugins/*-gnome-dbx-import.*
 %{_libdir}/evolution/*/plugins/*-gnome-face.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
+%{_libdir}/evolution/*/plugins/liborg-gnome-external-editor.so
+%{_libdir}/evolution/*/plugins/org-gnome-external-editor.eplug
 %if %{use_gtkimageview}
 %{_libdir}/evolution/*/plugins/*-gnome-image-inline.*
 %endif
-%{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.*
-%{_libdir}/evolution/*/plugins/*-imap-features.*
 %{_libdir}/evolution/*/plugins/*-itip-formatter.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
 %{_libdir}/evolution/*/plugins/*-mailing-list-actions.*
@@ -347,12 +302,4 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/eshell
 
-%files mono-plugins
-%defattr(-,root,root)
-%{_libdir}/evolution/*/modules/*-module-plugin-mono.*
-
-%files python-plugins
-%defattr(-,root,root)
-%{_libdir}/evolution/*/modules/*-module-plugin-python.*
-
 %changelog