diff --git a/qconfig-multilib.h b/qconfig-multilib.h
index f67084f..7ed351b 100644
--- a/qconfig-multilib.h
+++ b/qconfig-multilib.h
@@ -4,24 +4,17 @@
  *
  * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
 
-#if defined(__x86_64__)
-# include <QtCore/qconfig-x86_64.h>
-#elif defined(__i386__)
-# include <QtCore/qconfig-i386.h>
-#elif defined(__powerpc64__)
-# include <QtCore/qconfig-ppc64.h>
-#elif defined(__powerpc__)
-# include <QtCore/qconfig-ppc.h>
-#elif defined(__s390x__)
-# include <QtCore/qconfig-s390x.h>
-#elif defined(__s390__)
-# include <QtCore/qconfig-s390.h> 
-#elif defined(__sparc__) && defined (__arch64__)
-# include <QtCore/qconfig-sparc64.h>
-#elif defined(__sparc__)
-# include <QtCore/qconfig-sparc.h>
+#ifndef QCONFIG_MULTILIB_H
+#define QCONFIG_MULTILIB_H
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "QtCore/qconfig-32.h"
+#elif __WORDSIZE == 64
+#include "QtCore/qconfig-64.h"
 #else
-/* Should never reach this point, if so see bugzilla.redhat.com/223663 */
-#error "This qt4-devel package does not work your architecture?"
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
 #endif
 
diff --git a/qt.spec b/qt.spec
index 6864f5a..716bfde 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,7 +11,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -650,7 +650,7 @@ popd
 
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
-  mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
+  mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{__isa_bits}.h
   install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
   ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
   ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
@@ -658,7 +658,7 @@ popd
 
 %if "%{_qt4_libdir}" != "%{_libdir}"
   mkdir -p %{buildroot}/etc/ld.so.conf.d
-  echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf
+  echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{__isa_bits}.conf
 %endif
 
 # Trolltech.conf
@@ -1060,6 +1060,9 @@ fi
 
 
 %changelog
+* Thu Mar 29 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-3
+- Header file name mismatch in qt-devel i686 (#808087)
+
 * Thu Mar 29 2012 Than Ngo <than@redhat.com> - 4.8.1-2
 - add correct flags