diff --git a/SOURCES/sombok.h b/SOURCES/sombok.h
new file mode 100644
index 0000000..be01316
--- /dev/null
+++ b/SOURCES/sombok.h
@@ -0,0 +1,42 @@
+#if defined(__i386__)
+#include "sombok-i386.h"
+#elif defined(__ia64__)
+#include "sombok-ia64.h"
+#elif defined(__powerpc64__)
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#include "sombok-ppc64.h"
+#else
+#include "sombok-ppc64le.h"
+#endif
+#elif defined(__powerpc__)
+#include "sombok-ppc.h"
+#elif defined(__s390x__)
+#include "sombok-s390x.h"
+#elif defined(__s390__)
+#include "sombok-s390.h"
+#elif defined(__x86_64__)
+#include "sombok-x86_64.h"
+#elif defined(__arm__)
+#include "sombok-arm.h"
+#elif defined(__alpha__)
+#include "sombok-alpha.h"
+#elif defined(__sparc__) && defined (__arch64__)
+#include "sombok-sparc64.h"
+#elif defined(__sparc__)
+#include "sombok-sparc.h"
+#elif defined(__aarch64__)
+#include "sombok-aarch64.h"
+#elif defined(__mips64) && defined(__MIPSEL__)
+#include "sombok-mips64el.h"
+#elif defined(__mips64)
+#include "sombok-mips64.h"
+#elif defined(__mips) && defined(__MIPSEL__)
+#include "sombok-mipsel.h"
+#elif defined(__mips)
+#include "sombok-mips.h"
+#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
+#include "sombok-riscv64.h"
+#else
+#error "This sombok-devel package does not support your architecture."
+#endif
+
diff --git a/SPECS/sombok.spec b/SPECS/sombok.spec
index d46278f..2cd561b 100644
--- a/SPECS/sombok.spec
+++ b/SPECS/sombok.spec
@@ -1,12 +1,14 @@
 Name:           sombok
 Version:        2.4.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Unicode Text Segmentation Package
 
 Group:          System Environment/Libraries
 License:        GPLv2+ or Artistic clarified
 URL:            http://sf.net/projects/linefold/
 Source0:        https://github.com/hatukanezumi/sombok/archive/%{name}-%{version}.tar.gz
+# A multilib-safe wrapper, bug #1853166
+Source1:        sombok.h
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # libthai is available only in Fedora and EL6
@@ -53,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Rename sombok.h to sombok-ARCH.h and install a sombok.h wrapper to avoid
+# a file conflict on multilib systems, bug #1853166
+mv %{buildroot}/%{_includedir}/sombok.h %{buildroot}/%{_includedir}/sombok-%{_arch}.h
+install -m 0644 %{SOURCE1} %{buildroot}/%{_includedir}/sombok.h
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 03 2020 Petr Pisar <ppisar@redhat.com> - 2.4.0-7
+- Make sombok-devel package multilib safe (bug #1853166)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild