diff --git a/.gitignore b/.gitignore
index d273a14..7d13c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.13.8.tar.xz
 /evolution-data-server-3.13.9.tar.xz
 /evolution-data-server-3.13.10.tar.xz
+/evolution-data-server-3.13.90.tar.xz
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index e70666d..c45c82e 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -7,8 +7,8 @@
 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code
 %{!?with_docs: %define with_docs 1}
 
-%define glib2_version 2.36.0
-%define gtk3_version 3.4.0
+%define glib2_version 2.40.0
+%define gtk3_version 3.6.0
 %define gcr_version 3.4
 %define gtk_doc_version 1.9
 %define goa_version 3.8
@@ -17,12 +17,13 @@
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libical_version 0.46
-%define libsoup_version 2.40.3
+%define libsoup_version 2.42
 %define sqlite_version 3.5
 %define nss_version 3.14
 
 %define eds_base_version 3.14
 
+%define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules
 %define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
 %define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
 %define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
@@ -31,8 +32,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.13.10
-Release: 2%{?dist}
+Version: 3.13.90
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -246,10 +247,11 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/addressbook-backends/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/calendar-backends/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/registry-modules/*.a
+rm -f $RPM_BUILD_ROOT/%{credential_modules_dir}/*.a
+rm -f $RPM_BUILD_ROOT/%{camel_provider_dir}/*.a
+rm -f $RPM_BUILD_ROOT/%{ebook_backends_dir}/*.a
+rm -f $RPM_BUILD_ROOT/%{ecal_backends_dir}/*.a
+rm -f $RPM_BUILD_ROOT/%{modules_dir}/*.a
 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -281,6 +283,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/libedata-book-1.2.so.*
 %{_libdir}/libedata-cal-1.2.so.*
 %{_libdir}/libedataserver-1.2.so.*
+%{_libdir}/libedataserverui-1.2.so.*
 
 %{_libdir}/girepository-1.0/EBook-1.2.typelib
 %{_libdir}/girepository-1.0/EBookContacts-1.2.typelib
@@ -312,6 +315,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/pixmaps/evolution-data-server
 
 %dir %{_libdir}/evolution-data-server
+%dir %{credential_modules_dir}
 %dir %{camel_provider_dir}
 %dir %{ebook_backends_dir}
 %dir %{ecal_backends_dir}
@@ -339,6 +343,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{camel_provider_dir}/libcamelsmtp.urls
 
 # e-d-s extensions:
+%{credential_modules_dir}/module-credentials-goa.so
 %{ebook_backends_dir}/libebookbackendfile.so
 %{ebook_backends_dir}/libebookbackendgoogle.so
 %{ebook_backends_dir}/libebookbackendldap.so
@@ -369,6 +374,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/libedata-book-1.2.so
 %{_libdir}/libedata-cal-1.2.so
 %{_libdir}/libedataserver-1.2.so
+%{_libdir}/libedataserverui-1.2.so
 %{_libdir}/pkgconfig/camel-1.2.pc
 %{_libdir}/pkgconfig/evolution-data-server-1.2.pc
 %{_libdir}/pkgconfig/libebackend-1.2.pc
@@ -378,6 +384,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/pkgconfig/libedata-book-1.2.pc
 %{_libdir}/pkgconfig/libedata-cal-1.2.pc
 %{_libdir}/pkgconfig/libedataserver-1.2.pc
+%{_libdir}/pkgconfig/libedataserverui-1.2.pc
 %{_datadir}/gir-1.0/EBook-1.2.gir
 %{_datadir}/gir-1.0/EBookContacts-1.2.gir
 %{_datadir}/gir-1.0/EDataServer-1.2.gir
@@ -403,6 +410,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Feb 16 2015 Milan Crha <mcrha@redhat.com> - 3.13.90-1
+- Update to 3.13.90
+
 * Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 3.13.10-2
 - rebuild for ICU 54.1
 
diff --git a/sources b/sources
index ae174e1..1e42abd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8008b01636403cf0cdf4c91067571229  evolution-data-server-3.13.10.tar.xz
+3ca1395bb82a0458348165011b7f5ac3  evolution-data-server-3.13.90.tar.xz