diff --git a/srcpkgs/fontconfig/fontconfig-devel.template b/srcpkgs/fontconfig/fontconfig-devel.template
index 4680f7f3dd..afeafc6ae4 100644
--- a/srcpkgs/fontconfig/fontconfig-devel.template
+++ b/srcpkgs/fontconfig/fontconfig-devel.template
@@ -5,23 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=3
-
 Add_dependency run expat-devel
 Add_dependency run freetype-devel
 Add_dependency run zlib-devel
 Add_dependency run bzip2-devel
-Add_dependency run fontconfig
+Add_dependency run fontconfig ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man
-	mkdir -p ${DESTDIR}/usr/share/doc/fontconfig
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/doc/fontconfig/$pkgname* \
-		${DESTDIR}/usr/share/doc/fontconfig
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man3 usr/share/man
+	vmove usr/share/doc usr/share
 }
diff --git a/srcpkgs/fontconfig/patches/dont_run_fccache.diff b/srcpkgs/fontconfig/patches/dont_run_fccache.diff
deleted file mode 100644
index 0f00f6257a..0000000000
--- a/srcpkgs/fontconfig/patches/dont_run_fccache.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	2008-06-01 04:31:00.000000000 +0200
-+++ Makefile.in	2008-10-02 09:06:19.000000000 +0200
-@@ -801,16 +801,6 @@
- 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
- 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
- 	fi; fi
--	@(if $(RUN_FC_CACHE_TEST); then \
--	    echo " $(bindir)/fc-cache -s -f -v"; \
--	    $(bindir)/fc-cache -s -f -v; \
--	else \
--	    echo "***"; \
--	    echo "*** Warning: fonts.cache not built"; \
--	    echo "***"; \
--	    echo "*** Generate this file manually on host system using fc-cache"; \
--	    echo "***"; \
--	fi)
- 
- uninstall-local:
- 	if [ -f $(srcdir)/fonts.conf ]; then \
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 592430f930..6db10aa916 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,13 +1,14 @@
 # Template build file for 'fontconfig'.
 pkgname=fontconfig
-version=2.8.0
-revision=4
-distfiles="ftp://mirror.ovh.net/gentoo-distfiles/distfiles/$pkgname-$version.tar.gz"
+version=2.9.0
+homepage="http://www.fontconfig.org"
+license="MIT"
+distfiles="http://www.freedesktop.org/software/fontconfig/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-docs --with-cache-dir=/var/cache/$pkgname"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+checksum=ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
 long_desc="
  Fontconfig is a library for configuring and customizing font access.
 
@@ -36,6 +37,7 @@ long_desc="
 
 conf_files="/etc/fonts/fonts.conf"
 subpackages="$pkgname-devel"
+
 Add_dependency build pkg-config
 Add_dependency build expat-devel
 Add_dependency build freetype-devel