diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index 50d9f24611..bbf20bcdfe 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -2,10 +2,10 @@
 #
 depends="xproto kbproto libxcb-devel libX11>=$version"
 short_desc="${short_desc} - development files"
+noarch=yes
 
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/man usr/share
 }
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 5862b573cb..4ef3d0d68e 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -4,7 +4,7 @@ version=1.5.0
 revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
---disable-secure-rpc"
+--disable-secure-rpc --disable-static"
 makedepends="pkg-config xproto>=7.0.23 xextproto xtrans xcmiscproto
  kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel"
 subpackages="$pkgname-devel"
@@ -15,6 +15,17 @@ license="MIT"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="automake xorg-util-macros ${makedepends}"
+	crossmakedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto
+			  kbproto bigreqsproto inputproto>=2.2
+			  xf86bigfontproto libxcb-devel"
+	pre_configure() {
+		sed -e 's|$(srcdir)/||g' -i nls/Makefile.am
+		autoreconf -fi
+	}
+fi
+
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }