diff --git a/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch b/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch
new file mode 100644
index 0000000..5188f38
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch
@@ -0,0 +1,13 @@
+diff -up evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c.calbackendfile-interval-tree-destroy evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c
+--- evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c.calbackendfile-interval-tree-destroy	2021-06-16 16:09:19.863360296 +0200
++++ evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c	2021-06-16 16:10:14.225398710 +0200
+@@ -298,7 +298,8 @@ free_calendar_data (ECalBackendFile *cbf
+ 
+ 	g_rec_mutex_lock (&priv->idle_save_rmutex);
+ 
+-	e_intervaltree_destroy (priv->interval_tree);
++	if (priv->interval_tree)
++		e_intervaltree_destroy (priv->interval_tree);
+ 	priv->interval_tree = NULL;
+ 
+ 	free_calendar_components (priv->comp_uid_hash, priv->icalcomp);
diff --git a/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch b/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch
new file mode 100644
index 0000000..88b9a11
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch
@@ -0,0 +1,44 @@
+diff -up evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake
+--- evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison	2021-06-16 16:45:58.554763738 +0200
++++ evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake	2021-06-16 16:47:13.343021509 +0200
+@@ -19,32 +19,32 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec
index b62a3c9..b6e1ad2 100644
--- a/SPECS/evolution-data-server.spec
+++ b/SPECS/evolution-data-server.spec
@@ -32,7 +32,7 @@
 
 Name: evolution-data-server
 Version: 3.28.5
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -91,6 +91,12 @@ Patch12: evolution-data-server-3.28.5-CVE-2020-16117.patch
 # RH bug #1952792
 Patch13: evolution-data-server-3.28.5-imapx-icloud-mail.patch
 
+# RH bug #1972749
+Patch14: evolution-data-server-3.28.5-cmake-variable-name-comparison.patch
+
+# RH bug #1971676
+Patch15: evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -223,6 +229,8 @@ the functionality of the installed %{name} package.
 %patch11 -p1 -b .CVE-2020-14928
 %patch12 -p1 -b .CVE-2020-16117
 %patch13 -p1 -b .imapx-icloud-mail
+%patch14 -p1 -b .cmake-variable-name-comparison
+%patch15 -p1 -b .calbackendfile-interval-tree-destroy
 
 %build
 
@@ -484,6 +492,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Jun 16 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-17
+- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
+- Resolves: #1971676 (ECalBackendFile: Free interval tree only when being allocated)
+
 * Fri Apr 23 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-16
 - Resolves: #1952792 (IMAPx: Fix connect to iCloud mail server)