diff --git a/srcpkgs/libXxf86vm/libXxf86vm-devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
index c3baa508ff..22edd05e1e 100644
--- a/srcpkgs/libXxf86vm/libXxf86vm-devel.template
+++ b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
@@ -1,15 +1,14 @@
 # Template file for 'libXxf86vm-devel'.
 #
-depends="xf86vidmodeproto libX11-devel libXext-devel libXxf86vm"
+noarch=yes
+depends="xf86vidmodeproto libX11-devel libXext-devel ${sourcepkg}-${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
 	vmove usr/share usr
 }
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index cbd901ecaf..0fa0968beb 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -1,20 +1,18 @@
 # Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
 version=1.1.2
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=2
+subpackages="$pkgname-devel"
 build_style=gnu-configure
+configure_args="--disable-static"
 makedepends="pkg-config xf86vidmodeproto libX11-devel libXext-devel"
-revision=1
 short_desc="Library for the XFree86-VidMode X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 long_desc="
  These functions provide an interface to the server extension
  XFree86-VidModeExtension which allows the video modes to be queried
- and adjusted dynamically and mode switching to be controlled.
-
- This library is from the modular X.org project."
-
-subpackages="$pkgname-devel"
+ and adjusted dynamically and mode switching to be controlled."