diff --git a/gnome-session-avoid-blocking-when-connecting-dbus.patch b/gnome-session-avoid-blocking-when-connecting-dbus.patch
new file mode 100644
index 0000000..ce40916
--- /dev/null
+++ b/gnome-session-avoid-blocking-when-connecting-dbus.patch
@@ -0,0 +1,28 @@
+From 0903f9d861cb00cba9c1075cd57c6e9297122426 Mon Sep 17 00:00:00 2001
+From: Xiaoguang Wang <xwang@suse.com>
+Date: Thu, 15 Apr 2021 16:49:21 +0800
+Subject: [PATCH] GsmPresence: Avoid blocking when connecting dbus ScreenSaver
+
+https://gitlab.gnome.org/GNOME/gnome-session/-/issues/88
+---
+ gnome-session/gsm-presence.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c
+index cdfa3ccd..cd28f5ce 100644
+--- a/gnome-session/gsm-presence.c
++++ b/gnome-session/gsm-presence.c
+@@ -328,7 +328,9 @@ gsm_presence_constructor (GType                  type,
+         }
+ 
+         presence->priv->screensaver_proxy = g_dbus_proxy_new_sync (presence->priv->connection,
+-                                                                   G_DBUS_PROXY_FLAGS_NONE,
++                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
++                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
++                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                                                    NULL,
+                                                                    GS_NAME,
+                                                                    GS_PATH,
+-- 
+2.31.1
+
diff --git a/gnome-session.changes b/gnome-session.changes
index 0f49c56..298a6e9 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 19 01:17:31 UTC 2021 - xiaoguang wang <xiaoguang.wang@suse.com>
+
+- Add gnome-session-avoid-blocking-when-connecting-dbus.patch: Fix
+  the login delay, avoid the blocking when connecting to
+  ScreenSaver dbus(bsc#1184698 glgo#GNOME/gnome-session#88).
+
 -------------------------------------------------------------------
 Tue Apr 13 06:38:02 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gnome-session.spec b/gnome-session.spec
index daca3a0..c1e2f1c 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -29,6 +29,8 @@ Source2:        gnome.desktop
 
 # PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
 Patch0:         gnome-session-better-handle-empty-xdg_session_type.patch
+# PATCH-FIX-UPSTREAM gnome-session-avoid-blocking-when-connecting-dbus.patch bsc#1184698 glgo#GNOME/gnome-session#88 xwang@suse.com -- Avoid blocking when connecting to ScreenSaver dbus
+Patch1:         gnome-session-avoid-blocking-when-connecting-dbus.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes