diff --git a/srcpkgs/libXfont/libXfont-devel.template b/srcpkgs/libXfont/libXfont-devel.template
index 77b1fdcf2d..a83323ca36 100644
--- a/srcpkgs/libXfont/libXfont-devel.template
+++ b/srcpkgs/libXfont/libXfont-devel.template
@@ -1,14 +1,16 @@
 # Template file for 'libXfont-devel'.
 #
-depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel libXfont"
+depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel
+ libXfont-${version}_${revision}"
+
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+noarch=yes
 
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
index 3725d57712..9bfae1a04b 100644
--- a/srcpkgs/libXfont/template
+++ b/srcpkgs/libXfont/template
@@ -1,22 +1,22 @@
 # Template build file for 'libXfont'.
 pkgname=libXfont
 version=1.4.5
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-configure_args="--disable-devel-docs"
-makedepends="pkg-config xproto xtrans fontcacheproto fontsproto zlib-devel freetype-devel libfontenc-devel"
-revision=1
+configure_args="--disable-static --disable-devel-docs"
 short_desc="X font Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 long_desc="
  This package provides the X font Library from the modular
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-
+makedepends="pkg-config xproto xtrans fontcacheproto fontsproto
+ freetype-devel libfontenc-devel"
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}