diff --git a/SOURCES/qtcore-config-multilib.h b/SOURCES/qtcore-config-multilib.h
new file mode 100644
index 0000000..5482d88
--- /dev/null
+++ b/SOURCES/qtcore-config-multilib.h
@@ -0,0 +1,23 @@
+/* qtcore-config.h */
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because qtcore-config.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#ifndef QTCORE_CONFIG_MULTILIB_H
+#define QTCORE_CONFIG_MULTILIB_H
+
+#ifndef __WORDSIZE
+#include <bits/wordsize.h>
+#endif
+
+#if __WORDSIZE == 32
+#include "QtCore/qtcore-config-32.h"
+#elif __WORDSIZE == 64
+#include "QtCore/qtcore-config-64.h"
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+
diff --git a/SPECS/qt5-qtbase.spec b/SPECS/qt5-qtbase.spec
index 1fee0a4..26d06ec 100644
--- a/SPECS/qt5-qtbase.spec
+++ b/SPECS/qt5-qtbase.spec
@@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd)
 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.9.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -68,6 +68,10 @@ Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{
 Source1: qtlogging.ini
 
 # header file to workaround multilib issue
+# https://bugzilla.redhat.com/show_bug.cgi?id=1534528
+Source4: qtcore-config-multilib.h
+
+# header file to workaround multilib issue
 # https://bugzilla.redhat.com/show_bug.cgi?id=1036956
 Source5: qconfig-multilib.h
 
@@ -564,6 +568,9 @@ done
 popd
 
 %ifarch %{multilib_archs}
+# multilib: qtcore-config.h
+  mv %{buildroot}%{_qt5_headerdir}/QtCore/qtcore-config.h %{buildroot}%{_qt5_headerdir}/QtCore/qtcore-config-%{__isa_bits}.h
+  install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt5_headerdir}/QtCore/qtcore-config.h
 # multilib: qconfig.h
   mv %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-%{__isa_bits}.h
   install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h
@@ -689,7 +696,6 @@ fi
 %{_qt5_libdir}/libQt5Sql.so.5*
 %{_qt5_libdir}/libQt5Test.so.5*
 %{_qt5_libdir}/libQt5Xml.so.5*
-%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so.5*
 %dir %{_qt5_libdir}/cmake/
 %dir %{_qt5_libdir}/cmake/Qt5/
 %dir %{_qt5_libdir}/cmake/Qt5Concurrent/
@@ -981,6 +987,7 @@ fi
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
 %if 0%{?egl}
 %{_qt5_libdir}/libQt5EglFsKmsSupport.so.5*
+%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so.5*
 %{_qt5_plugindir}/platforms/libqeglfs.so
 %{_qt5_plugindir}/platforms/libqminimalegl.so
 %dir %{_qt5_plugindir}/egldeviceintegrations/
@@ -1020,6 +1027,13 @@ fi
 
 
 %changelog
+* Wed Feb 19 2020 Jan Grulich <jgrulich@redhat.com> - 5.9.7-3
+- Fix multilib issue with qtcore-config.h header file
+  Resolves: bz#1534528
+
+- Move libQt5EglFSDeviceIntegration lib into correct subpackage
+  Resolves: bz#1792680
+
 * Thu Feb 07 2019 Jan Grulich <jgrulich@redhat.com> - 5.9.7-1
 - Enable -doc subpkg on PPC
   Resolves: bz#1564000