diff --git a/SOURCES/flatpak-1.8.5-profile.d-Disable-gvfs-plugins-when-listing-flatpak-.patch b/SOURCES/flatpak-1.8.5-profile.d-Disable-gvfs-plugins-when-listing-flatpak-.patch
new file mode 100644
index 0000000..a7e4ee8
--- /dev/null
+++ b/SOURCES/flatpak-1.8.5-profile.d-Disable-gvfs-plugins-when-listing-flatpak-.patch
@@ -0,0 +1,30 @@
+From e61282d89bffe0b2ed923d9a0158cee35996e8e4 Mon Sep 17 00:00:00 2001
+From: Mourad De Clerck <bugs-debian@aquazul.com>
+Date: Wed, 25 Nov 2020 13:55:28 +0100
+Subject: [PATCH] profile.d: Disable gvfs plugins when listing flatpak
+ installations
+
+This avoids gvfs-daemon being started when logging in as root via ssh.
+
+Bug-Debian: https://bugs.debian.org/975710
+(cherry picked from commit f69a35ceec7322e02007b45d676e0b6f1e9376b0)
+---
+ profile/flatpak.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profile/flatpak.sh b/profile/flatpak.sh
+index 6c6e113ffd89..9dc6cf901ffd 100644
+--- a/profile/flatpak.sh
++++ b/profile/flatpak.sh
+@@ -5,7 +5,7 @@ if command -v flatpak > /dev/null; then
+         (
+             unset G_MESSAGES_DEBUG
+             echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak"
+-            flatpak --installations
++            GIO_USE_VFS=local flatpak --installations
+         ) | (
+             new_dirs=
+             while read -r install_path
+-- 
+2.31.1
+
diff --git a/SPECS/flatpak.spec b/SPECS/flatpak.spec
index 265250c..5cb4040 100644
--- a/SPECS/flatpak.spec
+++ b/SPECS/flatpak.spec
@@ -3,7 +3,7 @@
 
 Name:           flatpak
 Version:        1.8.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Application deployment framework for desktop apps
 
 License:        LGPLv2+
@@ -13,6 +13,8 @@ Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/
 Patch0:         flatpak-1.8.5-post-cve-fixes.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1938064
 Patch1:         flatpak-1.8.5-fix-CVE-2021-21381.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1980438
+Patch2:         flatpak-1.8.5-profile.d-Disable-gvfs-plugins-when-listing-flatpak-.patch
 
 BuildRequires:  pkgconfig(appstream-glib)
 BuildRequires:  pkgconfig(dconf)
@@ -244,6 +246,9 @@ fi
 
 
 %changelog
+* Tue Oct 05 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.8.5-5
+- Disable gvfs plugins when listing flatpak installations (#1980438)
+
 * Wed Jul 28 2021 Tomas Popela <tpopela@redhat.com> - 1.8.5-4
 - Ship flatpak-devel in CRB (#1938064)