diff --git a/srcpkgs/libXi/libXi-devel.template b/srcpkgs/libXi/libXi-devel.template
index f505bb6b5b9..bfd3557c466 100644
--- a/srcpkgs/libXi/libXi-devel.template
+++ b/srcpkgs/libXi/libXi-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'libXi-devel'.
 #
-depends="pkg-config inputproto libX11-devel libXext-devel libXi"
+depends="inputproto libX11-devel libXext-devel libXi>=${version}"
 short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
+noarch=yes
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove usr/share usr
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index 3a9419fb41b..c7fec54c72b 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -1,20 +1,14 @@
 # Template build file for 'libXi'.
 pkgname=libXi
-version=1.6.1
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config inputproto>=2.2 libX11-devel libXext-devel xmlto"
+version=1.6.2
 revision=1
+subpackages="$pkgname-devel"
+build_style=gnu-configure
+configure_args="--disable-static"
+makedepends="pkg-config inputproto>=2.2 libX11-devel libXext-devel xmlto"
 short_desc="X Input extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
-checksum=f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109
-long_desc="
- This package contains the Xi extension. This is the X Input extension
- library.
-
- This is part of the X Libraries and Protocol Headers Project at
- freedesktop.org."
-
-subpackages="$pkgname-devel"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+checksum=3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058