diff --git a/srcpkgs/evolution/depends b/srcpkgs/evolution/depends
index 214cb4e13b8..922a531c89a 100644
--- a/srcpkgs/evolution/depends
+++ b/srcpkgs/evolution/depends
@@ -1,2 +1,2 @@
-abi_depends=">=3.2.1"
+abi_depends=">=3.2.1_1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/evolution/evolution-devel.template b/srcpkgs/evolution/evolution-devel.template
index b40dad1bca3..f899b452396 100644
--- a/srcpkgs/evolution/evolution-devel.template
+++ b/srcpkgs/evolution/evolution-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run libevolution
 
 do_install()
diff --git a/srcpkgs/evolution/libevolution.template b/srcpkgs/evolution/libevolution.template
index 83958761c0b..35219687612 100644
--- a/srcpkgs/evolution/libevolution.template
+++ b/srcpkgs/evolution/libevolution.template
@@ -5,9 +5,9 @@ long_desc="${long_desc}
 
  This package contains the runtime libraries."
 
-Add_dependency run libcanberra
-Add_dependency run libgtkhtml
-Add_dependency run nss
+revision=1
+
+Add_dependency run glibc
 Add_dependency run evolution-data-server
 Add_dependency run libical
 Add_dependency run libSM
@@ -25,11 +25,12 @@ Add_dependency run libXext
 Add_dependency run libXdamage
 Add_dependency run libXcomposite
 Add_dependency run libXfixes
+Add_dependency run libgtkhtml
 Add_dependency run enchant
+Add_dependency run nss
+Add_dependency run nspr
 Add_dependency run sqlite
 Add_dependency run libsoup
-Add_dependency run nspr
-Add_dependency run glibc
 Add_dependency run gtk+3
 Add_dependency run GConf
 Add_dependency run libxml2
@@ -41,15 +42,11 @@ Add_dependency run gdk-pixbuf
 Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run libldap
-Add_dependency run libsoup-gnome
 Add_dependency run libnotify
-Add_dependency run gnome-online-accounts
-Add_dependency run libgdata
-Add_dependency run gstreamer
-Add_dependency run libgweather
+Add_dependency run libsoup-gnome
+Add_dependency run libcanberra
 
 do_install()
 {
-	vmove usr/lib/evolution usr/lib
+	vmove "usr/lib/evolution/3.2/*.so*" usr/lib/evolution/3.2
 }
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 4dac4cf2c8a..ed91543140c 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,12 +1,13 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.2.1
+revision=1
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-pst-import
---with-clutter --with-openldap
---with-krb5=/usr"
+configure_args="--disable-pst-import --with-clutter --with-openldap
+--with-krb5=/usr --disable-schemas-install --disable-scrollkeeper
+--disable-static --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 short_desc="Integrated mail, addressbook and calendaring"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -15,22 +16,71 @@ long_desc="
  Evolution provides integrated mail, addressbook and calendaring functionality
  to users of the GNOME desktop."
 
-subpackages="lib${pkgname} ${pkgname}-devel"
+gconf_schemas="
+apps_evolution_shell.schemas
+evolution-mail.schemas
+apps-evolution-mail-notification.schemas
+apps-evolution-attachment-reminder.schemas
+apps_evolution_email_custom_header.schemas
+apps_evolution_eplugin_face.schemas
+apps-evolution-template-placeholders.schemas
+apps_evolution_addressbook.schemas
+evolution-bogofilter.schemas
+apps_evolution_calendar.schemas
+apps-evolution-mail-prompts-checkdefault.schemas
+evolution-spamassassin.schemas"
 
+subpackages="lib${pkgname} ${pkgname}-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
 Add_dependency run libevolution
 Add_dependency run evolution-data-server
-Add_dependency run gtk+3
-Add_dependency run glib
 Add_dependency run libical
+Add_dependency run nspr
+Add_dependency run nss
+Add_dependency run sqlite
+Add_dependency run libsoup
+Add_dependency run libnotify
+Add_dependency run libgtkhtml
+Add_dependency run enchant
+Add_dependency run gtk+3
 Add_dependency run GConf
+Add_dependency run libxml2
+Add_dependency run gnome-desktop
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libsoup-gnome
+Add_dependency run libcanberra
+Add_dependency run libSM
+Add_dependency run libICE
 Add_dependency run mx
 Add_dependency run clutter-gtk
-Add_dependency run libnotify
-Add_dependency run libcanberra
+Add_dependency run clutter
+Add_dependency run cogl
+Add_dependency run json-glib
+Add_dependency run MesaLib
+Add_dependency run libXi
+Add_dependency run libdrm
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXdamage
+Add_dependency run libXcomposite
+Add_dependency run libXfixes
+Add_dependency run libgdata
+Add_dependency run libgweather
+Add_dependency run gstreamer
+Add_dependency run libldap
+Add_dependency run gnome-online-accounts
 
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
 Add_dependency build evolution-data-server-devel
 Add_dependency build gtk+3-devel
 Add_dependency build glib-devel
@@ -73,11 +123,18 @@ Add_dependency build gnome-online-accounts-devel
 Add_dependency build libgdata-devel
 Add_dependency build gstreamer-devel
 Add_dependency build libgweather-devel
-Add_dependency build pkg-config
-Add_dependency build intltool
 Add_dependency build mit-krb5-devel
+Add_dependency build NetworkManager-devel
 
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
 Add_dependency full gsettings-desktop-schemas
 Add_dependency full iso-codes
+
+post_install() {
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	for f in ${gconf_schemas}; do
+		gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \
+			--domain ${pkgname}-3.2 ${wrksrc}/${f}
+	done
+}