diff --git a/apport/ui.py b/apport/ui.py
index 0696a4ef..d21be8eb 100644
--- a/apport/ui.py
+++ b/apport/ui.py
@@ -80,7 +80,7 @@ def find_snap(package):
 
 
 def thread_collect_info(report, reportfile, package, ui, symptom_script=None,
-                        ignore_uninstalled=False):
+                        ignore_uninstalled=False, local_save=False):
     '''Collect information about report.
 
     Encapsulate calls to add_*_info() and update given report, so that this
@@ -139,7 +139,7 @@ def thread_collect_info(report, reportfile, package, ui, symptom_script=None,
         # check package origin; we do that after adding hooks, so that hooks have
         # the chance to set a third-party CrashDB.
         try:
-            if 'CrashDB' not in report and 'APPORT_DISABLE_DISTRO_CHECK' not in os.environ:
+            if 'CrashDB' not in report and 'APPORT_DISABLE_DISTRO_CHECK' not in os.environ and not local_save:
                 if 'Package' not in report:
                     report['UnreportableReason'] = _('This package does not seem to be installed correctly')
                 elif not apport.packaging.is_distro_package(report['Package'].split()[0]) and  \
@@ -1094,7 +1094,8 @@ class UserInterface:
                 icthread = apport.REThread.REThread(target=thread_collect_info,
                                                     name='thread_collect_info',
                                                     args=(self.report, self.report_file, self.cur_package,
-                                                          hookui, symptom_script, ignore_uninstalled))
+                                                          hookui, symptom_script, ignore_uninstalled,
+                                                          self.options.save))
                 icthread.start()
                 while icthread.is_alive():
                     self.ui_pulse_info_collection_progress()
diff --git a/debian/changelog b/debian/changelog
index 5bf1ff13..1986079b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apport (2.20.11-0ubuntu6) eoan; urgency=medium
+
+  * apport/ui.py: allow local save more aggressively.
+
+ -- Yuan-Chen Cheng <yc.cheng@canonical.com>  Fri, 19 Jul 2019 12:42:24 +0800
+
 apport (2.20.11-0ubuntu5) eoan; urgency=medium
 
   * SECURITY UPDATE: TOCTOU issue allows local user to read arbitrary