diff --git a/templates/libXext-devel b/templates/libXext-devel
new file mode 120000
index 00000000000..e72193217a8
--- /dev/null
+++ b/templates/libXext-devel
@@ -0,0 +1 @@
+libXext
\ No newline at end of file
diff --git a/templates/libXext/devel.template b/templates/libXext/devel.template
new file mode 100644
index 00000000000..259bba6b04d
--- /dev/null
+++ b/templates/libXext/devel.template
@@ -0,0 +1,19 @@
+# Template file for 'libXext-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXext
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share/man
+	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
+	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	rm -rf ${SRCPKGDESTDIR}/usr/share
+}
diff --git a/templates/libXext/template b/templates/libXext/template
index 2bbe5e35af5..29c7e2b64a9 100644
--- a/templates/libXext/template
+++ b/templates/libXext/template
@@ -1,14 +1,19 @@
+# Template build file for 'libXext'.
 pkgname=libXext
-version=1.0.4
+sourcepkg=$pkgname
+version=1.0.5
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="X Extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
+checksum=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
 long_desc="
  This package contains the X Extension library from the modular
  X.org X11 project."
 
-shared_deps="libX11-1.1"
-build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xextproto
+Add_dependency full glibc
+Add_dependency full libX11