diff --git a/SPECS/opensc.spec b/SPECS/opensc.spec
index 0dec665..0c709d9 100644
--- a/SPECS/opensc.spec
+++ b/SPECS/opensc.spec
@@ -3,7 +3,7 @@
 
 Name:           opensc
 Version:        0.19.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -37,7 +37,7 @@ BuildRequires:  autoconf automake libtool gcc
 BuildRequires:  desktop-file-utils
 BuildRequires:  bash-completion
 Requires:       pcsc-lite-libs%{?_isa}
-Requires:	pcsc-lite
+Requires:       pcsc-lite
 Obsoletes:      mozilla-opensc-signer < 0.12.0
 Obsoletes:      opensc-devel < 0.12.0
 Obsoletes:      coolkey <= 1.1.0-36
@@ -69,7 +69,9 @@ sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.example.
 
 %build
 autoreconf -fvi
+%ifarch %{ix86} ppc s390
 sed -i -e 's/opensc.conf/opensc-%{_arch}.conf/g' src/libopensc/Makefile.in
+%endif
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
 %configure  --disable-static \
   --disable-assert \
@@ -82,11 +84,21 @@ make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/opensc.module
+
+%ifarch %{ix86} ppc s390
+# To avoid multilib issues, move these files on 32b intel architectures
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/opensc.module
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/opensc.conf.5
+install -Dpm 644 doc/files/opensc.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/opensc-%{_arch}.conf.5
 # use NEWS file timestamp as reference for configuration file
 touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
+touch -r NEWS $RPM_BUILD_ROOT%{_mandir}/man5/opensc-%{_arch}.conf.5
+%else
+# For backward compatibility, symlink the old location to the new files
+ln -s %{_sysconfdir}/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
+%endif
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
@@ -135,6 +147,13 @@ fi
 %{_datadir}/bash-completion/*
 %endif
 
+%ifarch %{ix86} ppc s390
+%{_mandir}/man5/opensc-%{_arch}.conf.5*
+%else
+%config(noreplace) %{_sysconfdir}/opensc.conf
+%{_mandir}/man5/opensc.conf.5*
+%endif
+
 %config(noreplace) %{_sysconfdir}/opensc-%{_arch}.conf
 %{_datadir}/p11-kit/modules/opensc.module
 %{_bindir}/cardos-tool
@@ -188,10 +207,13 @@ fi
 %{_mandir}/man1/westcos-tool.1*
 %{_mandir}/man1/dnie-tool.1*
 %{_mandir}/man1/egk-tool.1*
-%{_mandir}/man5/*.5*
+%{_mandir}/man5/pkcs15-profile.5*
 
 
 %changelog
+* Thu Apr 18 2019 Jakub Jelen <jjelen@redhat.com> - 0.19.0-5
+- Avoid multilib issues (#1693380)
+
 * Wed Dec 12 2018 Jakub Jelen <jjelen@redhat.com> - 0.19.0-4
 - Unbreak the Dual CAC cards in PIV driver (#1651748)
 - Fix few more corner cases for handling different types of padding (#1595626)