diff --git a/.abf.yml b/.abf.yml
index 4b487ec..94f8d34 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  evolution-data-server-3.22.5.tar.xz: bd26eee1676ef6a4f285ae7f0fc2b338ad5a8055
+  evolution-data-server-3.24.5.tar.xz: 0a66c8f595b766a9ce193e32ec045d535ebf56f6
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index e26b31e..853dacb 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -2,9 +2,9 @@
 
 %define api		1.2
 %define base_version	3.0
-%define dir_version	3.22
+%define dir_version	3.24
 
-%define camelmajor 59
+%define camelmajor 60
 %define libcamel %mklibname camel %{api} %{camelmajor}
 %define devcamel %mklibname camel -d
 
@@ -12,7 +12,7 @@
 %define libebackend %mklibname ebackend %{api} %{ebackendmajor}
 %define devebackend %mklibname ebackend -d
 
-%define ebookmajor 16
+%define ebookmajor 19
 %define libebook %mklibname ebook %{api} %{ebookmajor}
 %define devebook %mklibname ebook -d
 
@@ -43,7 +43,7 @@
 
 Name:		evolution-data-server
 Summary:	Evolution Data Server
-Version:	3.22.5
+Version:	3.24.5
 Release:	1
 License:	LGPLv2+
 Group:		System/Libraries
@@ -58,6 +58,7 @@ BuildRequires:	intltool
 BuildRequires:	vala-tools
 BuildRequires:	db-devel
 BuildRequires:	openldap-devel
+BuildRequires:	cmake
 BuildRequires:	pkgconfig(gconf-2.0)
 BuildRequires:	pkgconfig(gcr-base-3)
 BuildRequires:	pkgconfig(gio-2.0)
@@ -74,9 +75,11 @@ BuildRequires:	pkgconfig(libsoup-2.4)
 BuildRequires:	pkgconfig(libxml-2.0)
 BuildRequires:	pkgconfig(nspr)
 BuildRequires:	pkgconfig(nss)
+BuildRequires:	pkgconfig(json-glib-1.0)
 BuildRequires:	pkgconfig(oauth)
 BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	pkgconfig(vapigen)
+BuildRequires:	pkgconfig(webkit2gtk-4.0)
 
 # workaround for libedbus-private library
 %ifarch x86_64
@@ -91,7 +94,6 @@ and calendar in the gnome desktop.
 
 %files -f %{name}-%{dir_version}.lang
 %doc COPYING NEWS
-%doc %{_datadir}/gtk-doc/html/eds/*
 %{_libexecdir}/%{name}
 %{_libexecdir}/camel-gpg-photo-saver
 %{_libexecdir}/camel-index-control-%{api}
@@ -258,7 +260,6 @@ Evolution Data Server provides a central location for your addressbook
 and calendar in the gnome desktop.
 
 %files -n %{devcamel}
-%doc %{_datadir}/gtk-doc/html/camel/*
 %{_includedir}/%{name}/camel
 %{_libdir}/pkgconfig/camel-%{api}.pc
 %{_libdir}/libcamel-%{api}.so
@@ -390,9 +391,11 @@ and calendar in the gnome desktop.
 %{_libdir}/libedataserver-%{api}.so
 %{_libdir}/libedataserverui-%{api}.so
 %{_datadir}/gir-1.0/EDataServer-%{girmajor}.gir
+%{_datadir}/gir-1.0/EDataServerUI-%{girmajor}.gir
 %{_datadir}/vala/vapi/libedataserver-%{api}.deps
 %{_datadir}/vala/vapi/libedataserver-%{api}.vapi
-
+%{_datadir}/vala/vapi/libedataserverui-%{api}.deps
+%{_datadir}/vala/vapi/libedataserverui-%{api}.vapi
 #----------------------------------------------------------------------------
 
 %package -n %{girname}
@@ -403,7 +406,9 @@ Group:		System/Libraries
 GObject Introspection interface description for %{name}.
 
 %files -n %{girname}
+%{_libdir}/girepository-1.0/Camel-%{girmajor}.typelib
 %{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib
+%{_libdir}/girepository-1.0/EDataServerUI-%{girmajor}.typelib
 %{_libdir}/girepository-1.0/EBook-%{girmajor}.typelib
 %{_libdir}/girepository-1.0/EBookContacts-%{girmajor}.typelib
 
@@ -411,25 +416,20 @@ GObject Introspection interface description for %{name}.
 
 %prep
 %setup -q
-%apply_patches
 
 %build
-%configure2_5x \
-	--with-krb5=%{_prefix} \
-	--with-krb5-libs=%{_libdir} \
-	--with-libdb=%{_prefix} \
-	--disable-static \
-	--disable-google-auth \
-	--with-openldap=yes \
-	--with-static-ldap=no \
-	--enable-gtk-doc=yes \
-	--disable-uoa \
-	--enable-vala-bindings
-
+%cmake \
+	-DENABLE_UOA=OFF \
+	-DENABLE_VALA_BINDINGS=ON \
+	-DENABLE_INTROSPECTION=ON \
+	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
+	-DSHARE_INSTALL_PREFIX=%{_datadir} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir}
 %make
 
 %install
-%makeinstall_std
+%makeinstall_std -C build 
 
 # give the libraries some executable bits 
 find %{buildroot} -name '*.so.*' -exec chmod +x {} \;