diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index ffba511ace2..3709e4af3bc 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@@ -2,9 +2,9 @@
 #
 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}"
+ libgweather-devel>=3.6.0 libldap-devel libgdata-devel
+ libgnome-keyring-devel gnome-online-accounts-devel>=3.6.0
+ ${sourcepkg}-${version}_${revision}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/evolution-data-server/evolution-data-server.rshlibs b/srcpkgs/evolution-data-server/evolution-data-server.rshlibs
index 6500738906c..d3748ee39ca 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server.rshlibs
+++ b/srcpkgs/evolution-data-server/evolution-data-server.rshlibs
@@ -1,5 +1,3 @@
-libgthread-2.0.so.0
-libsoup-gnome-2.4.so.1
 libgio-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
@@ -9,40 +7,26 @@ libical.so.0
 libgnome-keyring.so.0
 libsoup-2.4.so.1
 libgmodule-2.0.so.0
-librt.so.1
 libsqlite3.so.0
 libz.so.1
-libkrb5.so.3
-libk5crypto.so.3
 libcom_err.so.2
 libgssapi_krb5.so.2
-libdl.so.2
-libplc4.so
-libplds4.so
 libnspr4.so
 libssl3.so
 libsmime3.so
 libnss3.so
-libgoa-1.0.so.0
-libgcr-base-3.so.1
-libgck-1.so.0
-libp11-kit.so.0
 libdb-4.8.so
-libxml2.so.2
 libldap-2.4.so.2
 liblber-2.4.so.2
-libresolv.so.2
-libnsl.so.1
 libgdata.so.13
+libgoa-1.0.so.0
 liboauth.so.0
-libicalss.so.0
-libicalvcal.so.0
+libxml2.so.2
 libgweather-3.so.1
+libgcr-base-3.so.1
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
-libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
 libpango-1.0.so.0
 libcairo.so.2
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 194c3e6e696..24c83afa5e7 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,23 +1,23 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.6.0
-revision=3
+version=3.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-openldap
---with-krb5=/usr --with-nspr-includes=/usr/include/nspr
---with-nss-includes=/usr/include/nss --enable-vala-bindings"
+ --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
-gnome-online-accounts-devel>=3.6.0 vala-devel liboauth-devel"
+ 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"
 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=50a7dd1a8109aefa748e6ba7b6469bb5bf8739b30a197c495db516703f3aaba8
+checksum=637fcb6a83601af2968ca0b600958da8b0f25444224edc5fae41dea995924150
 long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."