diff --git a/templates/libXfont-devel b/templates/libXfont-devel
new file mode 120000
index 0000000000..73e43fe947
--- /dev/null
+++ b/templates/libXfont-devel
@@ -0,0 +1 @@
+libXfont
\ No newline at end of file
diff --git a/templates/libXfont/depends b/templates/libXfont/depends
new file mode 100644
index 0000000000..f1de44d64f
--- /dev/null
+++ b/templates/libXfont/depends
@@ -0,0 +1,2 @@
+abi_depends=1.4.0
+api_depends=${abi_depends}
diff --git a/templates/libXfont/devel.template b/templates/libXfont/devel.template
new file mode 100644
index 0000000000..2cb67c7e90
--- /dev/null
+++ b/templates/libXfont/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXfont-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXfont
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/templates/libXfont/template b/templates/libXfont/template
index 911e0a3e20..23191d8a11 100644
--- a/templates/libXfont/template
+++ b/templates/libXfont/template
@@ -1,15 +1,23 @@
+# Template build file for 'libXfont'.
 pkgname=libXfont
-version=1.3.3
+sourcepkg=$pkgname
+version=1.4.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="X font Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a
+checksum=eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75
 long_desc="
  This package provides the X font Library from the modular
  X.org X11 project."
 
-shared_deps="libfontenc-1.0 freetype-2.3.8 zlib-1.2"
-build_depends="pkg-config-0.23 fontcacheproto-0.1 xtrans-1.2 fontsproto-2.0
- ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xtrans
+Add_dependency build fontcacheproto
+Add_dependency build fontsproto
+Add_dependency full glibc
+Add_dependency full zlib
+Add_dependency full freetype
+Add_dependency full libfontenc