diff --git a/srcpkgs/libXcomposite/libXcomposite-devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template
index 7a29d41dfed..e332e80a184 100644
--- a/srcpkgs/libXcomposite/libXcomposite-devel.template
+++ b/srcpkgs/libXcomposite/libXcomposite-devel.template
@@ -1,17 +1,16 @@
 # Template file for 'libXcomposite-devel'.
 #
-depends="pkg-config xproto fixesproto compositeproto libX11-devel libXfixes-devel libXcomposite"
+depends="xproto compositeproto libXfixes-devel libX11-devel libXcomposite-${version}_${revision}"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+noarch=yes
 
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
 }
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 3e3eb4ce6a2..0d0de1c0e1e 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -1,16 +1,16 @@
 # Template build file for 'libXcomposite'.
 pkgname=libXcomposite
 version=0.4.3
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+configure_args="--disable-static"
 makedepends="pkg-config xproto fixesproto compositeproto libX11-devel libXfixes-devel"
 short_desc="X Composite Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 long_desc="
  This package contains the library and header files for the X Composite
  Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-