diff --git a/srcpkgs/freefont-ttf/files/conf.avail b/srcpkgs/freefont-ttf/files/conf.avail
new file mode 100644
index 00000000000..53575e24ba0
--- /dev/null
+++ b/srcpkgs/freefont-ttf/files/conf.avail
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>FreeMono</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>FreeSans</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>FreeSerif</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template
index 85a97a2fed1..e411e096e0d 100644
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@@ -1,24 +1,20 @@
 # Template file for 'freefont-ttf'
 pkgname=freefont-ttf
-version=20100919
-wrksrc=freefont-${version}
-distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.tar.gz"
-fulldepends="font-util"
+version=20120503
 revision=1
+noarch=yes
+wrksrc=freefont-${version}
+makedepends="unzip"
+fulldepends="font-util"
 short_desc="Free family of scalable outline fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e471339040cf0aa53e6d5ee5a716fdeae0a0407314f8cea78db3ad1aae2c70e0
-long_desc="
- GNU FreeFont is a free family of scalable outline fonts, suitable for
- general use on computers and for desktop publishing. It is Unicode-encoded
- for compatibility with all modern operating systems."
+homepage="http://www.nongnu.org/freefont/"
+license="GPL-2"
+distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.zip"
+checksum=7c85baf1bf82a1a1845d1322112bc6ca982221b484e3b3925022e25b5cae89af
 
-noarch=yes
-font_dirs="/usr/share/fonts/TTF"
-
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/share/fonts/TTF
+do_install() {
+	vmkdir usr/share/fonts/TTF
 	install -m644 ${wrksrc}/*.ttf ${DESTDIR}/usr/share/fonts/TTF
+	vinstall ${FILESDIR}/conf.avail 644 etc/fonts/conf.avail 69-freefont.conf
 }