diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index fa6d313473..17589d13c6 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run sqlite-devel
 Add_dependency run GConf-devel
 Add_dependency run mit-krb5-devel
@@ -19,10 +17,12 @@ Add_dependency run gnome-online-accounts-devel
 Add_dependency run vala-devel
 Add_dependency run evolution-data-server ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc,vala} ${DESTDIR}/usr/share
+noarch=yes
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/vala usr/share
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 07489f18d9..f66b4c2c84 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,9 +1,8 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.3.92
-revision=1
+version=3.4.0
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-openldap
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
@@ -11,7 +10,7 @@ configure_args="--with-openldap
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=a5cc6324899ecc936171ceb07ef678d341089615e6e600584baefbdd63e35a7d
+checksum=7132aee89b73187155c8afec43b9b3cc5c97098a488aad3872f7fedd0552a6ac
 long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."