diff --git a/templates/libXi-devel b/templates/libXi-devel
new file mode 120000
index 0000000000..3fa408cd31
--- /dev/null
+++ b/templates/libXi-devel
@@ -0,0 +1 @@
+libXi
\ No newline at end of file
diff --git a/templates/libXi/depends b/templates/libXi/depends
new file mode 100644
index 0000000000..911b41c266
--- /dev/null
+++ b/templates/libXi/depends
@@ -0,0 +1,2 @@
+abi_depends=1.2.1
+api_depends=${abi_depends}
diff --git a/templates/libXi/devel.template b/templates/libXi/devel.template
new file mode 100644
index 0000000000..2ce73fb0a8
--- /dev/null
+++ b/templates/libXi/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXi-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXi
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	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 ${DESTDIR}/usr
+}
diff --git a/templates/libXi/template b/templates/libXi/template
index 1acabe82ac..beb2ca5dec 100644
--- a/templates/libXi/template
+++ b/templates/libXi/template
@@ -1,10 +1,12 @@
+# Template build file for 'libXi'.
 pkgname=libXi
-version=1.1.3
+sourcepkg=$pkgname
+version=1.2.1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="X Input extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
+checksum=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
 long_desc="
  This package contains the Xi extension. This is the X Input extension
  library.
@@ -12,7 +14,11 @@ long_desc="
  This is part of the X Libraries and Protocol Headers Project at
  freedesktop.org."
 
-shared_deps="libX11-1.1 libXext-1.0"
-build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 inputproto-1.4
- ${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 build inputproto
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXext