diff --git a/gnome-session.spec b/gnome-session.spec
index f552cd9..a878160 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -9,7 +9,7 @@
 
 Name: gnome-session
 Version: 40.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: GNOME session manager
 
 License: GPLv2+
@@ -26,6 +26,8 @@ Patch4: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
 # For https://fedoraproject.org/w/index.php?title=Changes/HiddenGrubMenu
 # This should go upstream once systemd has a generic interface for this
 Patch5: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
+# subscription manager support
+Patch6: subscription-manager-support.patch
 
 BuildRequires: meson
 BuildRequires: gcc
@@ -137,6 +139,10 @@ cp $RPM_SOURCE_DIR/gnome-xorg.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome
 %{_userunitdir}/gnome-launched-.scope.d/
 
 %changelog
+* Mon Sep 06 2021 Kalev Lember <klember@redhat.com> - 40.1.1-4
+- Forward port subscription manager support from RHEL 8
+- Resolves: #1937113
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1.1-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/subscription-manager-support.patch b/subscription-manager-support.patch
new file mode 100644
index 0000000..fc3ff3e
--- /dev/null
+++ b/subscription-manager-support.patch
@@ -0,0 +1,26 @@
+From 523602887f92b448b497e99bf56d0b9f1ef376f7 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Mon, 6 Sep 2021 21:12:38 +0200
+Subject: [PATCH] data: Require org.gnome.SettingsDaemon.Subscription
+
+Make sure the gnome-settings-daemon subman plugin gets started on
+session startup.
+---
+ data/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/meson.build b/data/meson.build
+index e02b80d3..1684a99e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -24,6 +24,7 @@ required_components = {
+     'org.gnome.SettingsDaemon.Sharing',
+     'org.gnome.SettingsDaemon.Smartcard',
+     'org.gnome.SettingsDaemon.Sound',
++    'org.gnome.SettingsDaemon.Subscription',
+     'org.gnome.SettingsDaemon.UsbProtection',
+     'org.gnome.SettingsDaemon.Wacom',
+     'org.gnome.SettingsDaemon.XSettings',
+-- 
+2.31.1
+