diff -Nru sosreport-3.9/debian/changelog sosreport-3.9/debian/changelog
--- sosreport-3.9/debian/changelog	2020-03-20 06:48:01.000000000 +0000
+++ sosreport-3.9/debian/changelog	2020-04-27 15:33:16.000000000 +0000
@@ -1,3 +1,15 @@
+sosreport (3.9-1ubuntu2.1) focal; urgency=low
+
+  * d/p/0003-lshw-command.patch: (LP: #1871494)
+    - Add `lshw` command to hardware plugin 
+
+  [Eric Desrochers]
+  * d/p/0004-lds-substitute-oidc-conf.patch:
+    - landscape substitute oidc conf
+      in service file (LP: #1874526)
+
+ -- Heather Lemon <heather.lemon@canonical.com>  Mon, 27 Apr 2020 09:33:16 -0600
+
 sosreport (3.9-1ubuntu2) focal; urgency=medium
 
   * d/p/0002-lxd-drop-db-collection-and-introduce-lxd-buginfo.patch:
diff -Nru sosreport-3.9/debian/patches/0003-lshw-command.patch sosreport-3.9/debian/patches/0003-lshw-command.patch
--- sosreport-3.9/debian/patches/0003-lshw-command.patch	1970-01-01 00:00:00.000000000 +0000
+++ sosreport-3.9/debian/patches/0003-lshw-command.patch	2020-04-27 15:33:16.000000000 +0000
@@ -0,0 +1,25 @@
+From 2dd5cd45a8381fa36ea99c85b526f9d79e526d91 Mon Sep 17 00:00:00 2001
+From: Jose Castillo <jcastillo@redhat.com>
+Date: Wed, 1 Apr 2020 18:50:57 +0200
+Subject: [hardware] Add output of lshw
+ This plugin adds the output of the command
+ lshw, and its output complements what we
+ already collect with dmidecode.
+
+Signed-off-by: Jose Castillo <jcastillo@redhat.com>
+Origin: upstream, https://github.com/sosreport/sos/commit/2dd5cd45a8381fa36ea99c85b526f9d79e526d91
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1871494
+---
+ sos/plugins/hardware.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sos/plugins/hardware.py
++++ b/sos/plugins/hardware.py
+@@ -29,6 +29,7 @@
+         ])
+ 
+         self.add_cmd_output("dmidecode", root_symlink="dmidecode")
++        self.add_cmd_output("lshw")
+ 
+ 
+ # vim: set et ts=4 sw=4 :
diff -Nru sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch
--- sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch	1970-01-01 00:00:00.000000000 +0000
+++ sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch	2020-04-27 15:33:16.000000000 +0000
@@ -0,0 +1,55 @@
+Description: [landscape] Substitute oidc conf in service file
+ Substitute sensitive informations about oidc
+ found in landscape service configuration file.
+
+ From release 19.10, Landscape can use OpenID-Connect
+ (OIDC) to authenticate users. To enable OpenID-Connect
+ support, please add oidc-issuer, oidc-client-id and
+ oidc-client-secret to /etc/landscape/service.conf in
+ the [landscape] section.
+
+ Reference:
+ https://docs.ubuntu.com/landscape/en/onprem-auth#openid-connect-support
+
+ Resolves: #2023
+Author: Eric Desrochers <eric.desrochers@canonical.com>
+Origin: upstream, https://github.com/sosreport/sos/pull/2025/commits/0c4d821e26e1206a0b99f427b572931ba2fd9bb5
+Bug: https://github.com/sosreport/sos/issues/2023
+Bug-Ubuntu: https://launchpad.net/bugs/1874526
+Index: sosreport-3.9/sos/plugins/landscape.py
+===================================================================
+--- sosreport-3.9.orig/sos/plugins/landscape.py
++++ sosreport-3.9/sos/plugins/landscape.py
+@@ -57,6 +57,16 @@ class Landscape(Plugin, UbuntuPlugin):
+             r"secret-token = [********]"
+         )
+         self.do_file_sub(
++            "/etc/landscape/service.conf",
++            r"oidc-client-secret = (.*)",
++            r"oidc-client-secret = [********]"
++        )
++        self.do_file_sub(
++            "/etc/landscape/service.conf",
++            r"oidc-client-id = (.*)",
++            r"oidc-client-id = [********]"
++        )
++        self.do_file_sub(
+             "/etc/landscape/service.conf.old",
+             r"password = (.*)",
+             r"password = [********]"
+@@ -71,5 +81,15 @@ class Landscape(Plugin, UbuntuPlugin):
+             r"secret-token = (.*)",
+             r"secret-token = [********]"
+         )
++        self.do_file_sub(
++            "/etc/landscape/service.conf.old",
++            r"oidc-client-secret = (.*)",
++            r"oidc-client-secret = [********]"
++        )
++        self.do_file_sub(
++            "/etc/landscape/service.conf.old",
++            r"oidc-client-id = (.*)",
++            r"oidc-client-id = [********]"
++        )
+ 
+ # vim: set et ts=4 sw=4 :
diff -Nru sosreport-3.9/debian/patches/series sosreport-3.9/debian/patches/series
--- sosreport-3.9/debian/patches/series	2020-03-20 06:48:01.000000000 +0000
+++ sosreport-3.9/debian/patches/series	2020-04-27 15:33:16.000000000 +0000
@@ -1,2 +1,4 @@
 0001-unittest-py3-fix.patch
 0002-lxd-drop-db-collection-and-introduce-lxd-buginfo.patch
+0003-lshw-command.patch
+0004-lds-substitute-oidc-conf.patch