diff --git a/.abf.yml b/.abf.yml
index 9f4d005..e78d5da 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  evolution-data-server-3.28.3.tar.xz: 9e4456e26a34d9d52281dc7d0b71f1bf111aea87
+  evolution-data-server-3.36.4.tar.xz: 3e8c78d396a1c85b9f3476a5bc226b31a98a5feb
diff --git a/evolution-data-server.rpmlintrc b/evolution-data-server.rpmlintrc
new file mode 100644
index 0000000..78f9351
--- /dev/null
+++ b/evolution-data-server.rpmlintrc
@@ -0,0 +1,6 @@
+addFilter("E: library-not-linked-against-libc")
+addFilter("E: invalid-desktopfile")
+
+# khm... 
+addFilter("E: setgid-binary")
+addFilter("E: non-standard-executable-perm")
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 429151f..a6e1d12 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,9 +1,12 @@
 %define url_ver %(echo %{version}|cut -d. -f1,2)
 
+%define _libexecdir /usr/libexec
+
 %define api		1.2
+%define api_ecal 2.0
 %define base_version	3.0
 
-%define camelmajor 61
+%define camelmajor 62
 %define libcamel %mklibname camel %{api} %{camelmajor}
 %define devcamel %mklibname camel -d
 
@@ -11,29 +14,29 @@
 %define libebackend %mklibname ebackend %{api} %{ebackendmajor}
 %define devebackend %mklibname ebackend -d
 
-%define ebookmajor 19
+%define ebookmajor 20
 %define libebook %mklibname ebook %{api} %{ebookmajor}
 %define devebook %mklibname ebook -d
 
-%define ebookcontactsmajor 2
+%define ebookcontactsmajor 3
 %define libebookcontacts %mklibname ebook-contacts %{api} %{ebookcontactsmajor}
 %define devebookcontacts %mklibname ebook-contacts -d
 
-%define ecalmajor 19
-%define libecal %mklibname ecal %{api} %{ecalmajor}
+%define ecalmajor 1
+%define libecal %mklibname ecal %{api_ecal} %{ecalmajor}
 %define devecal %mklibname ecal -d
 
-%define edatabookmajor 25
+%define edatabookmajor 26
 %define libedatabook %mklibname edata-book %{api} %{edatabookmajor}
 %define devedatabook %mklibname edata-book -d
 
 %define edatacalmajor 28
-%define libedatacal %mklibname edata-cal %{api} %{edatacalmajor}
+%define libedatacal %mklibname edata-cal %{api_ecal} %{edatacalmajor}
 %define devedatacal %mklibname edata-cal -d
 
 %define edataserveruimajor 2
 %define libedataserverui %mklibname edataserverui %{api} %{edataserveruimajor}
-%define edataservermajor 23
+%define edataservermajor 24
 %define libedataserver %mklibname edataserver %{api} %{edataservermajor}
 %define devedataserver %mklibname edataserver -d
 
@@ -42,12 +45,13 @@
 
 Name:		evolution-data-server
 Summary:	Evolution Data Server
-Version:	3.28.3
+Version:	3.36.4
 Release:	1
 License:	LGPLv2+
 Group:		System/Libraries
 URL: 		https://wiki.gnome.org/Apps/Evolution
 Source0:	https://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
+Source1000: %{name}.rpmlintrc
 BuildRequires:	bison
 BuildRequires:	cmake
 BuildRequires:	gettext
@@ -68,7 +72,7 @@ BuildRequires:	pkgconfig(gtk+-3.0)
 BuildRequires:	pkgconfig(gweather-3.0)
 BuildRequires:	pkgconfig(krb5)
 BuildRequires:	pkgconfig(libgdata)
-BuildRequires:	pkgconfig(libical)
+BuildRequires:	pkgconfig(libical) >= 3.0.7
 BuildRequires:	pkgconfig(libsecret-1)
 BuildRequires:	pkgconfig(libsoup-2.4)
 BuildRequires:	pkgconfig(libxml-2.0)
@@ -78,7 +82,7 @@ BuildRequires:	pkgconfig(json-glib-1.0)
 BuildRequires:	pkgconfig(oauth)
 BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	pkgconfig(vapigen)
-BuildRequires:	pkgconfig(webkit2gtk-4.0) >= 2.16
+BuildRequires:	pkgconfig(webkit2gtk-4.0) >= 2.20
 BuildRequires:	pkgconfig(libcanberra-gtk3) >= 0.25
 
 # workaround for libedbus-private library
@@ -94,6 +98,7 @@ and calendar in the gnome desktop.
 
 %files -f %{name}.lang
 %doc COPYING NEWS
+%{_libdir}/%{name}
 %{_libexecdir}/%{name}
 %{_libexecdir}/camel-gpg-photo-saver
 %{_libexecdir}/camel-index-control-%{api}
@@ -124,8 +129,9 @@ and calendar in the gnome desktop.
 %{_userunitdir}/evolution-source-registry.service
 %{_userunitdir}/evolution-user-prompter.service
 
-#{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
-#{_datadir}/applications/org.gnome.Evolution-alarm-notify.desktop
+%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
+%{_datadir}/applications/org.gnome.Evolution-alarm-notify.desktop
+
 
 #----------------------------------------------------------------------------
 
@@ -194,7 +200,7 @@ Evolution Data Server provides a central location for your addressbook
 and calendar in the gnome desktop.
 
 %files -n %{libecal}
-%{_libdir}/libecal-%{api}.so.%{ecalmajor}*
+%{_libdir}/libecal-%{api_ecal}.so.%{ecalmajor}*
 
 #----------------------------------------------------------------------------
 
@@ -222,7 +228,7 @@ Evolution Data Server provides a central location for your addressbook
 and calendar in the gnome desktop.
 
 %files -n %{libedatacal}
-%{_libdir}/libedata-cal-%{api}.so.%{edatacalmajor}*
+%{_libdir}/libedata-cal-%{api_ecal}.so.%{ecalmajor}*
 
 #----------------------------------------------------------------------------
 
@@ -337,8 +343,8 @@ and calendar in the gnome desktop.
 
 %files -n %{devecal}
 %{_includedir}/%{name}/libecal/
-%{_libdir}/pkgconfig/libecal-%{api}.pc
-%{_libdir}/libecal-%{api}.so
+%{_libdir}/pkgconfig/libecal-%{api_ecal}.pc
+%{_libdir}/libecal-%{api_ecal}.so
 
 #----------------------------------------------------------------------------
 
@@ -369,8 +375,8 @@ and calendar in the gnome desktop.
 
 %files -n %{devedatacal}
 %{_includedir}/%{name}/libedata-cal/
-%{_libdir}/pkgconfig/libedata-cal-%{api}.pc
-%{_libdir}/libedata-cal-%{api}.so
+%{_libdir}/pkgconfig/libedata-cal-%{api_ecal}.pc
+%{_libdir}/libedata-cal-%{api_ecal}.so
 
 #----------------------------------------------------------------------------
 
@@ -431,13 +437,13 @@ GObject Introspection interface description for %{name}.
 
 %cmake \
 	-DENABLE_UOA=OFF \
-	-DENABLE_OAUTH2=OFF \
+	-DENABLE_OAUTH2=ON \
 	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
 	-DSHARE_INSTALL_PREFIX=%{_datadir} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DENABLE_VALA_BINDINGS=OFF \
-        -DENABLE_INTROSPECTION=OFF 
+    -DENABLE_INTROSPECTION=OFF
 #	-DCMAKE_SKIP_RPATH:BOOL=OFF
 %make
 
@@ -447,4 +453,6 @@ GObject Introspection interface description for %{name}.
 # give the libraries some executable bits 
 find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
 
+
 %find_lang %{name}
+