diff --git a/SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch b/SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch
new file mode 100644
index 0000000..4c4b91e
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.5-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/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec
index 458116b..36d3749 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: 18%{?dist}
+Release: 19%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -100,6 +100,9 @@ Patch15: evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch
 # RH bug #2008217
 Patch16: evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch
 
+# RH bug #1938533
+Patch17: evolution-data-server-3.28.5-secret-monitor-warnings.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -235,6 +238,7 @@ the functionality of the installed %{name} package.
 %patch14 -p1 -b .cmake-variable-name-comparison
 %patch15 -p1 -b .calbackendfile-interval-tree-destroy
 %patch16 -p1 -b .nonstandard-uuencode-encoding
+%patch17 -p1 -b .secret-monitor-warnings
 
 %build
 
@@ -496,6 +500,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Nov 22 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-19
+- Resolves: #1938533 (secret-monitor: Turn runtime warnings into debug prints)
+
 * Thu Sep 30 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-18
 - Resolves: #2008217 (Camel: Understand non-standard "Content-Transfer-Encoding: uuencode")