diff --git a/evolution-data-server-3.40.4-caldav-crash.patch b/evolution-data-server-3.40.4-caldav-crash.patch
new file mode 100644
index 0000000..7db499b
--- /dev/null
+++ b/evolution-data-server-3.40.4-caldav-crash.patch
@@ -0,0 +1,36 @@
+From ad616bafcf7df22d265f7254c82ec285252bf1e7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 24 May 2022 18:27:09 +0200
+Subject: [PATCH] I#359 - CalDAV: Crash on calendar update
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/359
+---
+ src/calendar/backends/caldav/e-cal-backend-caldav.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c b/src/calendar/backends/caldav/e-cal-backend-caldav.c
+index c8aeb8205..2aeed3c91 100644
+--- a/src/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -545,7 +545,8 @@ ecb_caldav_multiget_from_sets_sync (ECalBackendCalDAV *cbdav,
+ 	link = *in_link;
+ 
+ 	while (link && left_to_go > 0) {
+-		ECalMetaBackendInfo *nfo = link->data;
++		GSList *nfo_link = link;
++		ECalMetaBackendInfo *nfo = nfo_link->data;
+ 
+ 		link = g_slist_next (link);
+ 		if (!link) {
+@@ -635,7 +636,7 @@ ecb_caldav_multiget_from_sets_sync (ECalBackendCalDAV *cbdav,
+ 					else
+ 						e_cal_meta_backend_info_free (nfo);
+ 
+-					link->data = NULL;
++					nfo_link->data = NULL;
+ 					g_clear_error (&local_error);
+ 					continue;
+ 				} else if (local_error) {
+-- 
+2.35.1
+
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 08905cf..30ebb48 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -54,7 +54,7 @@
 
 Name: evolution-data-server
 Version: 3.40.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -64,6 +64,7 @@ Patch01: evolution-data-server-3.40.4-icalcompiter.patch
 Patch02: evolution-data-server-3.40.4-secret-monitor-warnings.patch
 Patch03: evolution-data-server-3.40.4-google-contacts-to-carddav.patch
 Patch04: evolution-data-server-3.40.4-google-oauth2.patch
+Patch05: evolution-data-server-3.40.4-caldav-crash.patch
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -479,6 +480,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/installed-tests
 
 %changelog
+* Tue May 24 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-6
+- Resolves: #2089902 (CalDAV: Crash on calendar update)
+
 * Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-5
 - Resolves: #2081747 (Backport patch for Google OAuth2 change)