diff --git a/PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch b/PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch
new file mode 100644
index 0000000..f1acca8
--- /dev/null
+++ b/PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch
@@ -0,0 +1,26 @@
+From 0a7437961dad8ba8366d133e73068c6a578e9754 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 29 Oct 2020 15:40:00 +0000
+Subject: [PATCH] Do not crash when calling pk_dbus_get_uid() before D-Bus is
+ setup
+
+Fixes https://github.com/hughsie/PackageKit/issues/436
+---
+ src/pk-dbus.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/pk-dbus.c b/src/pk-dbus.c
+index ddd04d4e6..af275eb2a 100644
+--- a/src/pk-dbus.c
++++ b/src/pk-dbus.c
+@@ -64,6 +64,10 @@ pk_dbus_get_uid (PkDbus *dbus, const gchar *sender)
+ 	g_return_val_if_fail (PK_IS_DBUS (dbus), G_MAXUINT);
+ 	g_return_val_if_fail (sender != NULL, G_MAXUINT);
+ 
++	/* no connection to DBus */
++	if (dbus->priv->proxy_uid == NULL)
++		return G_MAXUINT;
++
+ 	/* set in the test suite */
+ 	if (g_strcmp0 (sender, ":org.freedesktop.PackageKit") == 0) {
+ 		g_debug ("using self-check shortcut");
diff --git a/PackageKit.spec b/PackageKit.spec
index aaa8cf8..33598bb 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -6,7 +6,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   1.2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@@ -17,6 +17,11 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 Patch0:    PackageKit-0.3.8-RHEL-Vendor.conf.patch
 %endif
 
+# Do not crash on login.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1836304
+# https://github.com/hughsie/PackageKit/pull/437
+Patch1: PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
 BuildRequires: gtk-doc
@@ -235,6 +240,10 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/vala/vapi/packagekit-glib2.deps
 
 %changelog
+* Mon Nov  9 2020 Vít Ondruch <vondruch@redhat.com> - 1.2.2-2
+- Fix crash on login.
+  Resolves: rhbz#1836304
+
 * Mon Nov 02 2020 Richard Hughes <rhughes@redhat.com> - 1.2.2-1
 - New upstream release
 - Notify systemd when beginning to shutdown