diff --git a/.cvsignore b/.cvsignore
index 66399ba..eb047ac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontconfig-2.4.2.tar.gz
+fontconfig-2.4.91.tar.gz
diff --git a/fontconfig.spec b/fontconfig.spec
index 4b410e7..9311c17 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.4.2
-Release: 5%{?dist}
+Version: 2.4.91
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -52,7 +52,11 @@ will use fontconfig.
 %setup -q
 
 %build
-%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF
+
+# We don't want to rebuild the docs, but we want to install the included ones.
+export HASDOCBOOK=no
+
+%configure %--with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
 
 # Work around weird elinks bug where elinks refuses to open the
 # temporary html file generated by jade because it thinks it's a
@@ -141,6 +145,11 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 25 2007 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.91-1
+- Update to 2.4.91.
+- Add /usr/local/share/fonts to default config. (#147004)
+- Don't rebuild docs, to fix multilib conflicts. (#313011)
+
 * Wed Aug 22 2007 Adam Jackson <ajax@redhat.com> - 2.4.2-5
 - Rebuild for PPC toolchain bug
 - Add BuildRequires: gawk
diff --git a/sources b/sources
index cce6be2..e671f97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f035852f521b54677f2b5c9e2f6d54a4  fontconfig-2.4.2.tar.gz
+126f59b34499c70aaef2803f7fdd3ad3  fontconfig-2.4.91.tar.gz