diff --git a/freetype-multilib.patch b/freetype-multilib.patch
new file mode 100644
index 0000000..2bf30eb
--- /dev/null
+++ b/freetype-multilib.patch
@@ -0,0 +1,18 @@
+--- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
++++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
+@@ -9,11 +9,11 @@
+ # indicate that you have read the license and understand and accept it
+ # fully.
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=`pkg-config --variable prefix freetype2`
++exec_prefix=`pkg-config --variable exec_prefix freetype2`
+ exec_prefix_set=no
+-includedir=@includedir@
+-libdir=@libdir@
++includedir=`pkg-config --variable includedir freetype2`
++libdir=`pkg-config --variable includedir freetype2`
+ enable_shared=@enable_shared@
+ wl=@wl@
+ hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
diff --git a/freetype.spec b/freetype.spec
index 89b36e2..a0ad8ea 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 2.1
+Release: 3
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -22,6 +22,9 @@ Patch20:  freetype-2.1.10-enable-ft2-bci.patch
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
 
+# Fix multilib conflicts
+Patch88:  freetype-multilib.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -72,6 +75,8 @@ popd
 
 %patch46  -p1 -b .enable-valid
 
+%patch88 -p1 -b .multilib
+
 %build
 # Work around code generation problem with strict-aliasing
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
@@ -110,6 +115,32 @@ rm -rf $RPM_BUILD_ROOT
 }
 %endif
 
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \
+   $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h
+cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF
+#ifndef __FTCONFIG_H__MULTILIB
+#define __FTCONFIG_H___MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "art_config-32.h"
+#elif __WORDSIZE == 64
+# include "art_config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif 
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen  <mclasen@redhat.com> - 2.2.1-3
+- fix multilib issues
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.2.1-2.1
 - rebuild