diff --git a/gdm-daemon-Infer-session-type-from-desktop-file.patch b/gdm-daemon-Infer-session-type-from-desktop-file.patch
new file mode 100644
index 0000000..4a6cf49
--- /dev/null
+++ b/gdm-daemon-Infer-session-type-from-desktop-file.patch
@@ -0,0 +1,33 @@
+From ae75f642859dcfdcfcaaffc617ebe7a68cf0bed7 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 29 Sep 2021 11:03:41 -0400
+Subject: [PATCH] daemon: Infer session type from desktop file if user has no
+ saved session type
+
+The accountsservice user cache file can specify a session type
+associated with the saved session.  This is optional though. If one
+isn't specified GDM needs to figure out the session type based on the
+list of preferred session types for the system and the session file
+itself.
+
+It was failing to do the latter, though.  This commit fixes that.
+---
+ daemon/gdm-session.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index c1e2be008..4b709731d 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -1036,6 +1036,8 @@ worker_on_saved_session_name_read (GdmDBusWorker          *worker,
+                 }
+                 if (self->saved_session_type != NULL)
+                         set_session_type (self, self->saved_session_type);
++                else
++                        update_session_type (self);
+         }
+ 
+ }
+-- 
+GitLab
+
diff --git a/gdm.changes b/gdm.changes
index fb7f21f..389de15 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 19 09:21:15 UTC 2021 - Martin Wilck <mwilck@suse.com>
+
+- Add gdm-daemon-Infer-session-type-from-desktop-file.patch
+  (bsc#1191809, bsc#1191248)
+
 -------------------------------------------------------------------
 Tue Oct 12 01:41:13 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
 
diff --git a/gdm.spec b/gdm.spec
index 62a1c2c..5ae78b9 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -63,6 +63,8 @@ Patch13:        gdm-s390-not-require-g-s-d_wacom.patch
 Patch14:        gdm-switch-user-tty7.patch
 # PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bsc#1162888 glgo#GNOME/mutter#57 qkzhu@suse.com -- Disable Wayland on mgag200 chipsets
 Patch15:        gdm-disable-wayland-on-mgag200-chipsets.patch
+# PATCH-FIX-UPSTREAM gdm-daemon-Infer-session-type-from-desktop-file.patch bsc#1191809 glgo#GNOME/gdm#159 rstrode@redhat.com -- daemon: Infer session type from desktop file if user has no saved session type
+Patch16:        gdm-daemon-Infer-session-type-from-desktop-file.patch
 ### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
 # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
 Patch1000:      gdm-disable-gnome-initial-setup.patch
@@ -220,6 +222,7 @@ running display manager.
 %endif
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # SLE and Leap only patches start at 1000
 %if 0%{?sle_version}