diff --git a/apport/hookutils.py b/apport/hookutils.py
index 10116bc..c03e1fe 100644
--- a/apport/hookutils.py
+++ b/apport/hookutils.py
@@ -337,7 +337,9 @@ def attach_alsa_old(report):
 def attach_alsa(report):
     '''Attach ALSA subsystem information to the report.
     '''
-    if os.path.exists('/usr/share/alsa-base/alsa-info.sh'):
+    if os.path.exists('/usr/sbin/alsa-info'):
+        report['AlsaInfo'] = command_output(['/usr/sbin/alsa-info', '--stdout', '--no-upload'])
+    elif os.path.exists('/usr/share/alsa-base/alsa-info.sh'):
         report['AlsaInfo'] = command_output(['/usr/share/alsa-base/alsa-info.sh', '--stdout', '--no-upload'])
     else:
         attach_alsa_old(report)
@@ -348,6 +350,9 @@ def attach_alsa(report):
     if os.path.exists('/usr/bin/pacmd'):
         report['PulseList'] = command_output(['pacmd', 'list'])
 
+    if os.path.exists('/usr/bin/pa-info'):
+        report['pa-info'] = command_output(['/usr/bin/pa-info'])
+
     attach_dmi(report)
     attach_dmesg(report)
 
diff --git a/bin/oem-getlogs b/bin/oem-getlogs
index 10a5c6c..36db038 100755
--- a/bin/oem-getlogs
+++ b/bin/oem-getlogs
@@ -173,7 +173,11 @@ def add_info(report):
     for name in audio_system_commands:
         attach_command_output(report, audio_system_commands[name], name)
         dot()
-    attach_pathglob_as_zip(report, ['/usr/share/alsa/ucm/*/*'], "ALSA-UCM")
+    attach_pathglob_as_zip(report, ['/usr/share/alsa/ucm/*/*',
+                                    '/usr/share/alsa/ucm2/*',
+                                    '/usr/share/alsa/ucm2/*/*',
+                                    '/usr/share/alsa/ucm2/*/*/*'],
+                           "ALSA-UCM")
     dot()
 
     # FIXME: should be included in xorg in the future
diff --git a/debian/changelog b/debian/changelog
index 812b52e..c02e501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apport (2.20.11-0ubuntu46~p1) UNRELEASED; urgency=medium
+
+  * bin/oem-getlogs: add ucm2 directory. Per Hui Wang, ucm3 also
+    use ucm2 directory.
+  * apport/hookutils.py: add new pa-info command in pulseaudio
+    pre requested by Hui Wang.
+
+ --  <yc.cheng@canonical.com>  Wed, 02 Sep 2020 14:38:32 +0800
+
 apport (2.20.11-0ubuntu45) groovy; urgency=medium
 
   [ YC Cheng ]