diff --git a/srcpkgs/libXft/libXft-devel.template b/srcpkgs/libXft/libXft-devel.template
index 8b69106138..0d6983d2ac 100644
--- a/srcpkgs/libXft/libXft-devel.template
+++ b/srcpkgs/libXft/libXft-devel.template
@@ -1,11 +1,7 @@
 # Template file for 'libXft-devel'.
 #
-depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft"
+depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}"
 short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 56d4ba7653..38fa0ce864 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,14 +1,16 @@
 # Template build file for 'libXft'.
 pkgname=libXft
 version=2.3.0
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config xproto libX11-devel libXrender-devel freetype-devel fontconfig-devel"
-revision=1
+subpackages="$pkgname-devel"
+hostmakedepends="pkg-config"
+makedepends="xproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
 long_desc="
  Xft (2.0) provides a client-side font API for X applications. It uses
@@ -21,6 +23,3 @@ long_desc="
  Xft (2.0) hides most of the underlying system details so that developers
  can confidently use its API to access client-side fonts in any X
  environment."
-
-subpackages="$pkgname-devel"
-