diff --git a/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch b/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
index 3582c86..8c60d6f 100644
--- a/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
+++ b/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
@@ -1,7 +1,8 @@
-diff -ru fontconfig-2.4.2.orig/src/fcxml.c fontconfig-2.4.2/src/fcxml.c
---- fontconfig-2.4.2.orig/src/fcxml.c	2006-12-02 22:54:03.000000000 +0100
-+++ fontconfig-2.4.2/src/fcxml.c	2007-02-21 17:13:37.000000000 +0100
-@@ -557,6 +557,9 @@
+Index: fontconfig-2.7.0/src/fcxml.c
+===================================================================
+--- fontconfig-2.7.0.orig/src/fcxml.c
++++ fontconfig-2.7.0/src/fcxml.c
+@@ -539,6 +539,9 @@ FcTypecheckExpr (FcConfigParse *parse, F
  {
      const FcObjectType	*o;
      const FcConstant	*c;
@@ -9,5 +10,5 @@ diff -ru fontconfig-2.4.2.orig/src/fcxml.c fontconfig-2.4.2/src/fcxml.c
 +    if (!expr)
 +	return;
      
-     switch (expr->op) {
-     case FcOpInteger:
+     /* If parsing the expression failed, some nodes may be NULL */
+     if (!expr)
diff --git a/fontconfig.changes b/fontconfig.changes
index 50cc057..904527b 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:16 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Mon Aug 31 16:14:45 CEST 2009 - tiwai@suse.de
 
diff --git a/fontconfig.spec b/fontconfig.spec
index 7874fe7..7690568 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -24,7 +24,7 @@ BuildRequires:  freetype2-devel libexpat-devel pkgconfig
 %if %{build_docs}
 BuildRequires:  docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel tetex
 %endif
-License:        Public Domain, Freeware  ; MIT License (or similar)
+License:        Public Domain, Freeware   ; MIT License (or similar)
 Provides:       XFree86:/etc/fonts/fonts.dtd
 Group:          System/Libraries
 Url:            http://fontconfig.org/
@@ -35,7 +35,7 @@ Obsoletes:      fontconfig-64bit
 %endif
 Requires:       bash
 Version:        2.7.0
-Release:        2
+Release:        3
 Summary:        Library for Font Configuration
 # CVS can be found here: (CVS is gone, fontconfig uses git now).
 # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
diff --git a/usr-share-doc-packages.patch b/usr-share-doc-packages.patch
index b725828..fee8339 100644
--- a/usr-share-doc-packages.patch
+++ b/usr-share-doc-packages.patch
@@ -1,7 +1,8 @@
-diff -ru fontconfig-2.6.0//fc-cache/fc-cache.1 fontconfig-2.6.0.new//fc-cache/fc-cache.1
---- fontconfig-2.6.0//fc-cache/fc-cache.1	2008-05-05 17:13:40.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-cache/fc-cache.1	2008-10-29 19:08:52.000000000 +0100
-@@ -68,7 +68,7 @@
+Index: fontconfig-2.7.0/fc-cache/fc-cache.1
+===================================================================
+--- fontconfig-2.7.0.orig/fc-cache/fc-cache.1
++++ fontconfig-2.7.0/fc-cache/fc-cache.1
+@@ -68,7 +68,7 @@ appropriate fonts.
  \fBfc-list\fR (1).
  .PP
  The fontconfig user's guide, in HTML format:
@@ -10,11 +11,12 @@ diff -ru fontconfig-2.6.0//fc-cache/fc-cache.1 fontconfig-2.6.0.new//fc-cache/fc
  .SH "AUTHOR"
  .PP
  This manual page was written by Keith Packard
-diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache/fc-cache.sgml
---- fontconfig-2.6.0//fc-cache/fc-cache.sgml	2006-09-04 00:37:14.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-cache/fc-cache.sgml	2008-10-29 19:08:59.000000000 +0100
-@@ -177,7 +177,7 @@
-     <para><command>fc-list</command> (1).</para>
+Index: fontconfig-2.7.0/fc-cache/fc-cache.sgml
+===================================================================
+--- fontconfig-2.7.0.orig/fc-cache/fc-cache.sgml
++++ fontconfig-2.7.0/fc-cache/fc-cache.sgml
+@@ -180,7 +180,7 @@ manpage.1: manpage.sgml
+     </para>
  
      <para>The fontconfig user's guide, in HTML format:
 -      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@@ -22,10 +24,11 @@ diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache
  
   </refsect1>
    <refsect1>
-diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1
---- fontconfig-2.6.0//fc-cat/fc-cat.1	2008-05-05 17:13:41.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-cat/fc-cat.1	2008-10-29 19:09:20.000000000 +0100
-@@ -38,7 +38,7 @@
+Index: fontconfig-2.7.0/fc-cat/fc-cat.1
+===================================================================
+--- fontconfig-2.7.0.orig/fc-cat/fc-cat.1
++++ fontconfig-2.7.0/fc-cat/fc-cat.1
+@@ -31,7 +31,7 @@ Show version of the program and exit.
  \fBfc-cache\fR (1).
  .PP
  The fontconfig user's guide, in HTML format:
@@ -34,11 +37,12 @@ diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1
  .SH "AUTHOR"
  .PP
  This manual page was written by Patrick Lam <plam@mit.edu>\&.
-diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-cat.sgml
---- fontconfig-2.6.0//fc-cat/fc-cat.sgml	2006-12-03 00:08:03.000000000 +0100
-+++ fontconfig-2.6.0.new//fc-cat/fc-cat.sgml	2008-10-29 19:09:08.000000000 +0100
-@@ -130,7 +130,7 @@
-     <para><command>fc-cache</command> (1).</para>
+Index: fontconfig-2.7.0/fc-cat/fc-cat.sgml
+===================================================================
+--- fontconfig-2.7.0.orig/fc-cat/fc-cat.sgml
++++ fontconfig-2.7.0/fc-cat/fc-cat.sgml
+@@ -139,7 +139,7 @@ manpage.1: manpage.sgml
+     </para>
  
      <para>The fontconfig user's guide, in HTML format:
 -      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@@ -46,10 +50,11 @@ diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-ca
  
   </refsect1>
    <refsect1>
-diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-list.1
---- fontconfig-2.6.0//fc-list/fc-list.1	2008-05-05 17:13:42.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-list/fc-list.1	2008-10-29 19:06:43.000000000 +0100
-@@ -54,7 +54,7 @@
+Index: fontconfig-2.7.0/fc-list/fc-list.1
+===================================================================
+--- fontconfig-2.7.0.orig/fc-list/fc-list.1
++++ fontconfig-2.7.0/fc-list/fc-list.1
+@@ -54,7 +54,7 @@ fonts.
  \fBfc-cache\fR (1).
  .PP
  The fontconfig user's guide, in HTML format:
@@ -58,11 +63,12 @@ diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-li
  .SH "AUTHOR"
  .PP
  This manual page was written by Keith Packard
-diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc-list.sgml
---- fontconfig-2.6.0//fc-list/fc-list.sgml	2006-08-27 23:36:52.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-list/fc-list.sgml	2008-10-29 19:08:27.000000000 +0100
-@@ -158,7 +158,7 @@
-     <para><command>fc-cache</command> (1).</para>
+Index: fontconfig-2.7.0/fc-list/fc-list.sgml
+===================================================================
+--- fontconfig-2.7.0.orig/fc-list/fc-list.sgml
++++ fontconfig-2.7.0/fc-list/fc-list.sgml
+@@ -184,7 +184,7 @@ manpage.1: manpage.sgml
+     </para>
  
      <para>The fontconfig user's guide, in HTML format:
 -      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@@ -70,10 +76,11 @@ diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc
  
   </refsect1>
    <refsect1>
-diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc-match.1
---- fontconfig-2.6.0//fc-match/fc-match.1	2008-05-05 17:13:42.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-match/fc-match.1	2008-10-29 19:07:54.000000000 +0100
-@@ -45,7 +45,7 @@
+Index: fontconfig-2.7.0/fc-match/fc-match.1
+===================================================================
+--- fontconfig-2.7.0.orig/fc-match/fc-match.1
++++ fontconfig-2.7.0/fc-match/fc-match.1
+@@ -45,7 +45,7 @@ Displays fonts matching
  \fBfc-list\fR (1).
  .PP
  The fontconfig user's guide, in HTML format:
@@ -82,11 +89,12 @@ diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc
  .SH "AUTHOR"
  .PP
  This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&.
-diff -ru fontconfig-2.6.0//fc-match/fc-match.sgml fontconfig-2.6.0.new//fc-match/fc-match.sgml
---- fontconfig-2.6.0//fc-match/fc-match.sgml	2006-09-04 00:37:14.000000000 +0200
-+++ fontconfig-2.6.0.new//fc-match/fc-match.sgml	2008-10-29 19:08:06.000000000 +0100
-@@ -140,7 +140,7 @@
-     <para><command>fc-list</command> (1).</para>
+Index: fontconfig-2.7.0/fc-match/fc-match.sgml
+===================================================================
+--- fontconfig-2.7.0.orig/fc-match/fc-match.sgml
++++ fontconfig-2.7.0/fc-match/fc-match.sgml
+@@ -186,7 +186,7 @@ output is requested.</para>
+     </para>
  
      <para>The fontconfig user's guide, in HTML format:
 -      <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>