diff --git a/SPECS/gcc-toolset-11.spec b/SPECS/gcc-toolset-11.spec
index 56e78b5..7e40bc2 100644
--- a/SPECS/gcc-toolset-11.spec
+++ b/SPECS/gcc-toolset-11.spec
@@ -5,7 +5,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 11.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,11 +15,14 @@ Source1: sudo.sh
 # The base package requires just the toolchain and the perftools.
 Requires: %{scl_prefix}toolchain %{scl_prefix}perftools
 Obsoletes: %{name} < %{version}-%{release}
+Obsoletes: %{scl_prefix}dockerfiles < %{version}-%{release}
 
 BuildRequires: scl-utils-build >= 20120927-11
 BuildRequires: iso-codes
 BuildRequires: help2man
+%if 0%{?rhel} >= 8
 BuildRequires: python3-devel
+%endif
 
 %description
 This is the main package for %scl Software Collection.
@@ -29,8 +32,13 @@ Summary: Package that handles %scl Software Collection.
 Group: Applications/File
 Requires: scl-utils >= 20120927-11
 Obsoletes: %{name}-runtime < %{version}-%{release}
+%if 0%{?rhel} >= 7
 Requires(post): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon
 Requires(postun): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon
+%else
+Requires(post): libselinux policycoreutils-python
+Requires(postun): libselinux policycoreutils-python
+%endif
 
 %description runtime
 Package shipping essential scripts to work with %scl Software Collection.
@@ -54,6 +62,9 @@ Requires: %{scl_prefix}binutils %{scl_prefix}gdb %{scl_prefix}strace
 Requires: %{scl_prefix}dwz %{scl_prefix}elfutils
 Requires: %{scl_prefix}ltrace %{scl_prefix}make
 Requires: %{scl_prefix}annobin
+%if 0%{?rhel} <= 7
+Requires: %{scl_prefix}memstomp
+%endif
 Obsoletes: %{name}-toolchain < %{version}-%{release}
 
 %description toolchain
@@ -64,13 +75,24 @@ Summary: Package shipping performance tools
 Group: Applications/File
 Requires: %{scl_prefix}runtime
 Requires: %{scl_prefix}systemtap %{scl_prefix}valgrind
+%if 0%{?rhel} <= 7
+Requires: %{scl_prefix}oprofile
+%ifarch x86_64
+Requires: %{scl_prefix}dyninst
+%endif
+%else
 %ifarch x86_64 ppc64le aarch64
 Requires: %{scl_prefix}dyninst
 %endif
+%endif
 Obsoletes: %{name}-perftools < %{version}-%{release}
 
 %description perftools
+%if 0%{?rhel} <= 7
+Package shipping performance tools (systemtap, oprofile)
+%else
 Package shipping performance tools (systemtap)
+%endif
 
 %prep
 %setup -c -T
@@ -109,11 +131,18 @@ export PCP_DIR=%{_scl_root}
 # or else /etc/ld.so.conf.d files?
 rpmlibdir=\$(rpm --eval "%%{_libdir}")
 # bz1017604: On 64-bit hosts, we should include also the 32-bit library path.
+# bz1873882: On 32-bit hosts, we should include also the 64-bit library path.
 if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then
   rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}"
+  dynpath32="\$rpmlibdir32/dyninst"
+else
+  rpmlibdir64=":%{_scl_root}\${rpmlibdir/lib/lib64}"
+  dynpath64="\$rpmlibdir64/dyninst"
 fi
-export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}}
-export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir32:%{_scl_root}\$rpmlibdir/dyninst\$rpmlibdir32/dyninst\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}}
+# Add SCL dyninst to LD_LIBRARY_PATH, both 64- and 32-bit paths.
+export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir/dyninst\$dynpath64\$dynpath32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}}
+# Now prepend the usual /opt/.../usr/lib{64,}.
+export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}}
 export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}
 EOF
 
@@ -123,12 +152,10 @@ cat <<'EOF' > sudo
 %{expand:%(cat %{SOURCE1})}
 EOF
 
-# " (Fix vim syntax coloring.)
-
 %install
 (%{scl_install})
 
-# This allows users to build packages using GTS.
+# This allows users to build packages using DTS/GTS.
 cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
 %%enable_devtoolset11 %%global ___build_pre %%{___build_pre}; source scl_source enable %{scl} || :
 EOF
@@ -186,5 +213,8 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
-* Wed Apr 21 2021 Marek Polacek <polacek@redhat.com> - 11.0.0
+* Wed Jul 28 2021 Marek Polacek <polacek@redhat.com> - 11.0-1
+- on 32-bit hosts, include also the 64-bit library path (#1986097)
+
+* Wed Apr 21 2021 Marek Polacek <polacek@redhat.com> - 11.0-0
 - new package