diff --git a/SOURCES/ilmbase-config.h b/SOURCES/ilmbase-config.h
new file mode 100644
index 0000000..eaa5b05
--- /dev/null
+++ b/SOURCES/ilmbase-config.h
@@ -0,0 +1,10 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "IlmBaseConfig-32.h"
+#elif __WORDSIZE == 64
+#include "IlmBaseConfig-64.h"
+#else
+#error "Unknown word size"
+#endif
+
diff --git a/SPECS/ilmbase.spec b/SPECS/ilmbase.spec
index 6b5f1bc..2c6959b 100644
--- a/SPECS/ilmbase.spec
+++ b/SPECS/ilmbase.spec
@@ -2,11 +2,12 @@
 Name:    ilmbase
 Summary: Abstraction/convenience libraries
 Version: 2.2.0
-Release: 11%{?dist}
+Release: 13%{?dist}
 
 License: BSD
 URL:	 http://www.openexr.com/
 Source0: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}.tar.gz
+Source1: ilmbase-config.h
 
 #BuildRequires: automake libtool
 BuildRequires: pkgconfig
@@ -65,6 +66,17 @@ make %{?_smp_mflags} PTHREAD_LIBS="-pthread -lpthread"
 make install DESTDIR=%{buildroot}
 
 rm -fv %{buildroot}%{_libdir}/lib*.la
+# Fix multilibs header conflict
+%ifarch x86_64 i686
+%ifarch x86_64
+mv %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h \
+  %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig-64.h
+%else
+mv %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h \
+  %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig-32.h
+%endif
+install -pm 0644 %{SOURCE1} %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h
+%endif
 
 
 %check
@@ -97,6 +109,12 @@ make %{?_smp_mflags} check
 
 
 %changelog
+* Wed Jan 13 2021 Josef Ridky <jridky@redhat.com> - 2.2.0-13
+- add gating.yaml file
+
+* Tue Jan 12 2021 Josef Ridky <jridky@redhat.com> - 2.2.0-12
+- fix multilib conflict (#1853147)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild