diff --git a/common/shlibs b/common/shlibs
index b36807f6ddb..6710e11940a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -565,15 +565,14 @@ libical_cxx.so.2 libical-2.0.0_1
 libicalss.so.2 libical-2.0.0_1
 libicalss_cxx.so.2 libical-2.0.0_1
 libicalvcal.so.2 libical-2.0.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
+libcamel-1.2.so.60 evolution-data-server-3.24.0_1
 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
 libedataserverui-1.2.so.1 evolution-data-server-3.8.0_1
 libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1
 libedata-book-1.2.so.25 evolution-data-server-3.8.0_1
-libebook-1.2.so.16 evolution-data-server-3.8.0_1
+libebook-1.2.so.19 evolution-data-server-3.24.0_1
 libecal-1.2.so.19 evolution-data-server-3.18.0_1
 libedata-cal-1.2.so.28 evolution-data-server-3.18.0_1
 libgdata.so.19 libgdata-0.15.0_1
diff --git a/srcpkgs/evolution-data-server/patches/cmake.patch b/srcpkgs/evolution-data-server/patches/cmake.patch
new file mode 100644
index 00000000000..b97690d7e22
--- /dev/null
+++ b/srcpkgs/evolution-data-server/patches/cmake.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2017-03-20 02:47:25.000000000 -0600
++++ CMakeLists.txt	2017-04-05 18:02:54.871910269 -0600
+@@ -524,10 +524,6 @@
+ CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
+ unset(CMAKE_REQUIRED_LIBRARIES)
+ 
+-if(NOT _correct_iconv)
+-	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
+-endif(NOT _correct_iconv)
+-
+ # ******************************
+ # Backtraces for debugging
+ # ******************************
diff --git a/srcpkgs/evolution-data-server/patches/iconv_10646.patch b/srcpkgs/evolution-data-server/patches/iconv_10646.patch
deleted file mode 100644
index 1f42bdf5f3d..00000000000
--- a/srcpkgs/evolution-data-server/patches/iconv_10646.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add a definition for ICONV_10646 in case it's missing
-
---- camel/camel-iconv.h	2014-03-24 10:07:52.000000000 +0100
-+++ camel/camel-iconv.h	2015-06-01 08:41:44.271620227 +0200
-@@ -28,6 +28,9 @@
- #include <sys/types.h>
- #include <iconv.h>
- #include <glib.h>
-+#ifndef ICONV_10646
-+#define ICONV_10646 "iso-10646"
-+#endif
- 
- G_BEGIN_DECLS
- 
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index b692bba1274..1c3b6a11d91 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,13 +1,9 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.22.6
-revision=2
-build_style=gnu-configure
-configure_args="--with-openldap --disable-uoa
- --with-krb5=${XBPS_CROSS_BASE}/usr
- --with-nspr-includes=${XBPS_CROSS_BASE}/usr/include/nspr
- --with-nss-includes=${XBPS_CROSS_BASE}/usr/include/nss
- --disable-google-auth $(vopt_enable gir vala-bindings)"
+version=3.24.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF"
 hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)"
 makedepends="db-devel sqlite-devel mit-krb5-devel nss-devel libical-devel
  libsecret-devel libsoup-gnome-devel gcr-devel libldap-devel
@@ -16,9 +12,10 @@ depends="libsoup-gnome>=2.46 libgweather>=3.12"
 short_desc="Centralized access to appointments and contacts"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
-homepage="http://www.gnome.org"
+homepage="https://wiki.gnome.org/Apps/Evolution"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=0a69b9d2c03f7a6f68abbd7c7f8c76d333aca9e6102e796d88daed3284e91ca6
+checksum=41ddb60b08ee287e82be52ebbe49b5a336984e52584a5fd34c82d45493f8031b
+nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) broken="webkit2gtk broken for now";;
@@ -29,14 +26,19 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
+if [ ! -z "$build_option_gir" ]; then
+	configure_args+=" -DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON"
+fi
+
 pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		# Create iconv-detect.h for cross builds
-		echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h
-		echo  >>iconv-detect.h
-		echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >>iconv-detect.h
-		echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
+	if [ ! -d "build" ]; then
+		mkdir build
 	fi
+	echo '/* This is an auto-generated header, DO NOT EDIT! */' > build/iconv-detect.h
+	echo  >> build/iconv-detect.h
+	echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >> build/iconv-detect.h
+	echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >> build/iconv-detect.h
+	echo '#define ICONV_10646 "iso-10646"' >> build/iconv-detect.h
 }
 post_install() {
 	# Fix broken pkg-config