diff --git a/add-dwz-single-file-mode-option.patch b/add-dwz-single-file-mode-option.patch
new file mode 100644
index 0000000..77b1988
--- /dev/null
+++ b/add-dwz-single-file-mode-option.patch
@@ -0,0 +1,62 @@
+From d741374effd75baaa35047c29c7a8adf819138ff Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Mon, 15 Mar 2021 16:58:34 +0100
+Subject: [PATCH] Add --dwz-single-file-mode argument for find-debuginfo.sh.
+
+Sometime it's handy to disable multi-file mode and the patch
+adds option for that: --dwz-single-file-mode.
+
+It will be used in openSUSE for packages that use baselibs.conf
+mechanism.
+---
+ scripts/find-debuginfo.sh | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
+index e0c36ebb6..2503b0f01 100755
+--- a/scripts/find-debuginfo.sh
++++ b/scripts/find-debuginfo.sh
+@@ -10,6 +10,7 @@
+ #	 		   [-S debugsourcefiles.list]
+ #			   [--run-dwz] [--dwz-low-mem-die-limit N]
+ #			   [--dwz-max-die-limit N]
++#			   [--dwz-single-file-mode]
+ #			   [--build-id-seed SEED]
+ #			   [--unique-debug-suffix SUFFIX]
+ #			   [--unique-debug-src-base BASE]
+@@ -45,6 +46,8 @@
+ # The --run-dwz flag instructs find-debuginfo.sh to run the dwz utility
+ # if available, and --dwz-low-mem-die-limit and --dwz-max-die-limit
+ # provide detailed limits.  See dwz(1) -l and -L option for details.
++# Use --dwz-single-file-mode to disable multi-file mode, see -m
++# for more details.
+ #
+ # If --build-id-seed SEED is given then debugedit is called to
+ # update the build-ids it finds adding the SEED as seed to recalculate
+@@ -96,6 +99,7 @@ no_recompute_build_id=false
+ run_dwz=false
+ dwz_low_mem_die_limit=
+ dwz_max_die_limit=
++dwz_single_file_mode=false
+ 
+ # build id seed given by the --build-id-seed option
+ build_id_seed=
+@@ -129,6 +133,9 @@ while [ $# -gt 0 ]; do
+     dwz_max_die_limit=$2
+     shift
+     ;;
++  --dwz-single-file-mode)
++    dwz_single_file_mode=true
++    ;;
+   --build-id-seed)
+     build_id_seed=$2
+     shift
+@@ -523,7 +530,7 @@ if $run_dwz \
+     done
+     dwz_multifile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
+     dwz_opts="-h -q -r"
+-    [ ${#dwz_files[@]} -gt 1 ] \
++    [ ${#dwz_files[@]} -gt 1 ] && [ "$dwz_single_file_mode" = "false" ] \
+       && dwz_opts="${dwz_opts} -m .dwz/${dwz_multifile_name}"
+     mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz"
+     [ -n "${dwz_low_mem_die_limit}" ] \
diff --git a/macrosin.diff b/macrosin.diff
index 8c9ddbf..3c9eb40 100644
--- a/macrosin.diff
+++ b/macrosin.diff
@@ -1,11 +1,10 @@
 --- ./macros.in.orig	2020-09-30 12:42:09.146057387 +0000
 +++ ./macros.in	2020-09-30 12:45:30.517611707 +0000
-@@ -177,7 +177,7 @@
-     %{?_unique_build_ids:--build-id-seed "%{VERSION}-%{RELEASE}"} \\\
+@@ -168,6 +168,7 @@
      %{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
      %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
--    %{?_find_debuginfo_dwz_opts} \\\
-+    %{lua:if not posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r") then print(rpm.expand("%{?_find_debuginfo_dwz_opts}")) end} \\\
+     %{?_find_debuginfo_dwz_opts} \\\
++    %{lua:if posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r") then print("--dwz-single-file-mode") end} \\\
      %{?_find_debuginfo_opts} \\\
      %{?_debugsource_packages:-S debugsourcefiles.list} \\\
      "%{_builddir}/%{?buildsubdir}"\
diff --git a/rpm.changes b/rpm.changes
index cf2a444..6907d89 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+Tue Apr 16 07:49:37 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Use --dwz-single-file-mode for packages that use
+  baselibs.conf mechanism.
+- Add add-dwz-single-file-mode-option.patch patch.
+
 -------------------------------------------------------------------
 Fri Apr  9 13:34:24 CEST 2021 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 5cd8540..6b79ec1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -128,6 +128,7 @@ Patch123:       nextiteratorheaderblob.diff
 Patch129:       ndbglue.diff
 Patch130:       dwarf5.diff
 Patch131:       posttrans.diff
+Patch132:       add-dwz-single-file-mode-option.patch
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -256,6 +257,7 @@ cp build-aux/config.guess build-aux/config.sub db/dist/
 %patch -P 100        -P 102 -P 103
 %patch -P 109                                           -P 117
 %patch -P 122 -P 123 -P 129 -P 130 -P 131
+%patch132 -p1
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464