diff --git a/fontconfig.changes b/fontconfig.changes
index e8381ba..a6f373f 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Mar 23 18:46:17 CET 2007 - mfabian@suse.de
+
+- Bugzilla #118131 comment #93: set the autohinter default
+  matching on "font" instead of on "pattern".
+  If an autohint value is set in pattern, OpenOffice 2.1 will use
+  that even if there are fontconfig rules matching on "font" which
+  should override it again). This doesn't cause any problems for
+  Cairo/Gnome (see bug #104365) because Cairo/Gnome don't try to
+  change the autohint value anyway. 
+
 -------------------------------------------------------------------
 Mon Mar 12 16:01:47 CET 2007 - mfabian@suse.de
 
diff --git a/fontconfig.spec b/fontconfig.spec
index 38d0579..c1b1a55 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -23,7 +23,7 @@ URL:            http://fontconfig.org/
 Autoreqprov:    on
 Requires:       bash
 Version:        2.4.2
-Release:        4
+Release:        5
 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
@@ -221,6 +221,14 @@ rm -rf $RPM_BUILD_ROOT
 %{myprefix}/include/fontconfig/
 
 %changelog
+* Fri Mar 23 2007 - mfabian@suse.de
+- Bugzilla #118131 comment #93: set the autohinter default
+  matching on "font" instead of on "pattern".
+  If an autohint value is set in pattern, OpenOffice 2.1 will use
+  that even if there are fontconfig rules matching on "font" which
+  should override it again). This doesn't cause any problems for
+  Cairo/Gnome (see bug #104365) because Cairo/Gnome don't try to
+  change the autohint value anyway.
 * Mon Mar 12 2007 - mfabian@suse.de
 - duplicate patterns correctly (fixes some parts of bug #244579
   for Qt4).
diff --git a/suse-hinting.conf b/suse-hinting.conf
index b5d1c99..ce30e55 100644
--- a/suse-hinting.conf
+++ b/suse-hinting.conf
@@ -33,10 +33,16 @@
         </match>
 
 <!--
-    Set autohinter=true as the default, then add exceptions for certain fonts:
+    Set autohinter=true as the default, then add exceptions for certain fonts.
+
+    Match on "font" here, not on "pattern" because of bug #118131 comment #93.
+    (If an autohint value is set in pattern, OpenOffice 2.1 will use that even
+    if there are fontconfig rules matching on "font" which should override it
+    again). This doesn't cause any problems for Cairo/Gnome (see bug #104365)
+    because Cairo/Gnome don't try to change the autohint value anyway. 
 -->
 	
-        <match target="pattern">
+        <match target="font">
                 <edit name="autohint">
                         <bool>true</bool>
                 </edit>