diff --git a/evolution-data-server-3.40.4-secret-monitor-warnings.patch b/evolution-data-server-3.40.4-secret-monitor-warnings.patch
new file mode 100644
index 0000000..4c4b91e
--- /dev/null
+++ b/evolution-data-server-3.40.4-secret-monitor-warnings.patch
@@ -0,0 +1,21 @@
+diff -up evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c.secret-monitor-warnings evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c
+--- evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c.secret-monitor-warnings	2018-07-30 15:17:06.000000000 +0200
++++ evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c	2021-11-22 12:52:08.683986536 +0100
+@@ -167,7 +167,7 @@ secret_monitor_scan_secrets_thread (gpoi
+ 	g_list_free_full (list, (GDestroyNotify) g_object_unref);
+ 
+ 	if (local_error != NULL) {
+-		g_warning ("%s: %s", G_STRFUNC, local_error->message);
++		e_source_registry_debug_print ("%s: %s", G_STRFUNC, local_error->message);
+ 		g_error_free (local_error);
+ 	}
+ 
+@@ -206,7 +206,7 @@ secret_monitor_scan_secrets_timeout_cb (
+ 		g_thread_unref (thread);
+ 
+ 	if (local_error != NULL) {
+-		g_warning ("%s: %s", G_STRFUNC, local_error->message);
++		e_source_registry_debug_print ("%s: %s", G_STRFUNC, local_error->message);
+ 		g_error_free (local_error);
+ 		g_object_unref (server);
+ 	}
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 75e44d5..1f3c9f7 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -54,13 +54,14 @@
 
 Name: evolution-data-server
 Version: 3.40.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
 Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
 
 Patch01: evolution-data-server-3.40.4-icalcompiter.patch
+Patch02: evolution-data-server-3.40.4-secret-monitor-warnings.patch
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -477,6 +478,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Nov 22 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-3
+- Resolves: #2025480 (secret-monitor: Turn runtime warnings into debug prints)
+
 * Mon Nov 08 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-2
 - Resolves: #2021055 (Add patch to correct ICalCompIter component's usage)