diff --git a/srcpkgs/libXtst/libXtst-devel.template b/srcpkgs/libXtst/libXtst-devel.template
index a214744295..46676016f4 100644
--- a/srcpkgs/libXtst/libXtst-devel.template
+++ b/srcpkgs/libXtst/libXtst-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'libXtst-devel'.
 #
-depends="recordproto libX11-devel libXext-devel libXtst"
+noarch=yes
+depends="recordproto libX11-devel libXext-devel libXi-devel libXtst>=${version}_${revision}"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libXtst/template b/srcpkgs/libXtst/template
index 04bf202f86..77505c3bbc 100644
--- a/srcpkgs/libXtst/template
+++ b/srcpkgs/libXtst/template
@@ -1,16 +1,16 @@
 # Template build file for 'libXtst'.
 pkgname=libXtst
 version=1.2.1
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
+configure_args="--disable-static"
+subpackages="$pkgname-devel"
 makedepends="pkg-config recordproto inputproto libX11-devel libXext-devel libXi-devel"
-revision=1
 short_desc="X Tst Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 long_desc="
  This package provides the X Tst Library from the modular X.org X11 project."
- 
-subpackages="$pkgname-devel"