diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index 5d4f167c9a4..09744287cc8 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@@ -1,10 +1,8 @@
 # Template file for 'evolution-data-server-devel'.
 #
-noarch=yes
 depends="sqlite-devel mit-krb5-devel nss-devel libical-devel
- libgweather-devel>=3.6.0 libldap-devel libgdata-devel
- libgnome-keyring-devel gnome-online-accounts-devel>=3.6.0
- ${sourcepkg}-${version}_${revision}"
+ libldap-devel libgdata-devel libsecret-devel
+ gnome-online-accounts-devel>=3.8.0 ${sourcepkg}-${version}_${revision}"
 short_desc="${short_desc} - development files"
 
 do_install() {
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index afa8264bd7a..ed8983fc1d2 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,20 +1,19 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.6.3
+version=3.8.0
 revision=1
 build_style=gnu-configure
-configure_args="--with-openldap
+configure_args="--with-openldap --disable-uoa
  --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
  --with-nss-includes=/usr/include/nss --enable-vala-bindings"
-makedepends="pkg-config intltool flex gperf gobject-introspection
- sqlite-devel mit-krb5-devel nss-devel libical-devel libgnome-keyring-devel
- libsoup-gnome-devel>=2.40 gcr-devel>=3.6.0 libgweather-devel>=3.6.0
- libldap-devel libgdata-devel vala-devel liboauth-devel
- gnome-online-accounts-devel>=3.6.0"
+hostmakedepends="pkg-config intltool flex gperf gobject-introspection"
+makedepends="sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel
+ libsoup-gnome-devel>=2.40 gcr-devel>=3.8.0 libldap-devel libgdata-devel
+ vala-devel>=0.20 libgweather-devel>=3.8.0"
 subpackages="$pkgname-devel"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
-checksum=37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0
+distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
+checksum=fff7dca02abc52caa62ddbd93a9135c15da3f21c36c25774f3399fb7a6c1d41e