diff --git a/fontconfig.changes b/fontconfig.changes
index 9b00c5f..8dcbe51 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,12 +1,13 @@
 -------------------------------------------------------------------
 Mon May 28 11:53:08 UTC 2012 - pgajdos@suse.com
 
-- DejaVu Sans, Droid Sans, Liberation Sans, Cantarell: use 
+- DejaVu Sans, Droid Sans, Liberation Sans: use 
   hintslight with BCI (instead of hintfull with BCI)
 - DejaVu Serif, Droid Serif, Liberation Serif: use
   hintslight with BCI (instead of hintfull with BCI)
 - DejaVu Sans Mono, Droid Sans Mono, Liberation Mono: keep
   hintfull with BCI
+- Cantarell: use hintfull with BCI
 
 -------------------------------------------------------------------
 Thu May 24 14:24:05 UTC 2012 - pgajdos@suse.com
diff --git a/suse-hinting.conf b/suse-hinting.conf
index 6ab8a3d..7937e69 100644
--- a/suse-hinting.conf
+++ b/suse-hinting.conf
@@ -346,7 +346,6 @@ exceptions:
        Liberation Sans 
        DejaVu Sans
        Droid Sans
-       Cantarell
        Liberation Serif
        DejaVu Serif
        Droid Serif
@@ -386,18 +385,6 @@ exceptions:
     </edit>
   </match>
 
-  <match target="font">
-    <test name="family">
-      <string>Cantarell</string>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-  </match>
-
   <match target="font">
     <test name="family">
       <string>Liberation Serif</string>
@@ -425,4 +412,23 @@ exceptions:
     </edit>
   </match>
 
+  <!-- Cantarell: the TrueType rules doesn't apply to Cantarell,
+       because fontformat="CFF" for it; autohint causes big space
+       between 'T' and 'e' e. g. in "Template", so using BCI 
+       instead. hintsligt causes too wide vertical lines in some
+       circumstances, hintfull seems to be better choice therefore.
+    -->
+
+  <match target="font">
+    <test name="family">
+      <string>Cantarell</string>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
 </fontconfig>