diff --git a/flatpak.changes b/flatpak.changes
index 97904e0..227b2fa 100644
--- a/flatpak.changes
+++ b/flatpak.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon May 18 08:53:10 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
+
+- When SLE uses GNOME desktop environment, GNOME Software is
+  automatically started to provide key update features. During the
+  startup, it setups flatpak repository so that related features
+  can function properly. In a system environment of no flatpak
+  repository has ever been setup before, this triggers
+  "org.freedesktop.Flatpak.modify-repo" polkit action.
+
+  Therefore in systems which use a restrictive security policy
+  (eg. SLES) for the aforementioned policy action, a polkit
+  authentication dialog will pop up without any user interaction
+  for the first time login. This is not user friendly.
+
+  This submission creates /var/lib/flatpak/repo at package
+  installation to avoid such a confusing authentication pop-up, at
+  nearly 0 cost of security compromise (bsc#1171822).
+
 -------------------------------------------------------------------
 Mon Apr  6 14:31:20 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/flatpak.spec b/flatpak.spec
index ad45ad1..f3cbad9 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -179,6 +179,7 @@ rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/
 %endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/flatpak/remotes.d
+mkdir -p %{buildroot}%{_localstatedir}/lib/flatpak/repo
 
 %find_lang %{name}
 
@@ -239,7 +240,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/flatpak/remotes.d
 %{_sbindir}/rcflatpak-system-helper
 %{_userunitdir}/flatpak-session-helper.service
 %{_userunitdir}/flatpak-portal.service
-%ghost %dir %{_localstatedir}/lib/flatpak
+%dir %{_localstatedir}/lib/flatpak
+%dir %{_localstatedir}/lib/flatpak/repo
 %if %{support_environment_generators}
 %dir %{_libexecdir}/systemd/user-environment-generators
 %{_libexecdir}/systemd/user-environment-generators/60-flatpak