diff --git a/srcpkgs/cantarell-fonts/INSTALL b/srcpkgs/cantarell-fonts/INSTALL
index e614314b42..9c6f0573c0 100644
--- a/srcpkgs/cantarell-fonts/INSTALL
+++ b/srcpkgs/cantarell-fonts/INSTALL
@@ -4,7 +4,7 @@
 case "${ACTION}" in
 post)
 	echo "Building fonts cache... "
-	fc-cache -f >/dev/null
+	fc-cache -fs >/dev/null
 	echo "done."
 	;;
 esac
diff --git a/srcpkgs/cantarell-fonts/REMOVE b/srcpkgs/cantarell-fonts/REMOVE
index e614314b42..9c6f0573c0 100644
--- a/srcpkgs/cantarell-fonts/REMOVE
+++ b/srcpkgs/cantarell-fonts/REMOVE
@@ -4,7 +4,7 @@
 case "${ACTION}" in
 post)
 	echo "Building fonts cache... "
-	fc-cache -f >/dev/null
+	fc-cache -fs >/dev/null
 	echo "done."
 	;;
 esac
diff --git a/srcpkgs/cantarell-fonts/files/21-cantarell-hinting.conf b/srcpkgs/cantarell-fonts/files/21-cantarell-hinting.conf
new file mode 100644
index 0000000000..7d5df9c5f2
--- /dev/null
+++ b/srcpkgs/cantarell-fonts/files/21-cantarell-hinting.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!-- Force the autohinter for Cantarell, as it does not have TT hinting -->
+  <match target="font">
+    <test name="family" compare="eq" ignore-blanks="true">
+      <string>Cantarell</string>
+    </test>
+    <edit name="autohint">
+      <bool>true</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
index 064f557c09..6e4f192473 100644
--- a/srcpkgs/cantarell-fonts/template
+++ b/srcpkgs/cantarell-fonts/template
@@ -1,19 +1,17 @@
 # Template file for 'cantarell-fonts'
 pkgname=cantarell-fonts
 version=0.0.12
-revision=1
+revision=2
 noarch=yes
 build_style=gnu-configure
 makedepends="pkg-config"
 fulldepends="fontconfig"
 short_desc="Cantarell family of TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://abattis.org/cantarell/"
+license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.xz"
 checksum=3d509e1117dd92a6b80ef8b2586c89e178dc21a03c7c61f5c50772def5c4934b
-long_desc="
- The Cantarell typeface family is a contemporary Humanist
- sans serif, and is used by the GNOME project for its user
- interface and the Fedora project."
 
 post_install() {
 	vmkdir etc/fonts/conf.d
@@ -21,4 +19,6 @@ post_install() {
 		${DESTDIR}/etc/fonts/conf.avail
 	rmdir ${DESTDIR}/usr/share/fontconfig
 	ln -s ../conf.avail/31-cantarell.conf ${DESTDIR}/etc/fonts/conf.d
+	vinstall ${FILESDIR}/21-cantarell-hinting.conf 644 etc/fonts/conf.avail
+	ln -s ../conf.avail/21-cantarell-hinting.conf ${DESTDIR}/etc/fonts/conf.d
 }