diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index a56b001756..3698a067a0 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libX11-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -21,8 +21,12 @@ Add_dependency run libX11
 do_install()
 {
 	install -d ${DESTDIR}/usr/{lib,share}
+	install -d ${DESTDIR}/usr/lib/X11/locale/common
+
 	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/{doc,man} ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/lib/X11/locale/common/*.a \
+		${DESTDIR}/usr/lib/X11/locale/common
 }
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index d031474319..89b0a2e45a 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,13 +1,13 @@
 # Template build file for 'libX11'.
 pkgname=libX11
-version=1.3.99.902
+version=1.4.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
 --enable-secure-rpc --enable-loadable-i18n"
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9435dc0214afea0567f5f9f894cc62e44505511e4221dc936df361f14817bf2e
+checksum=b2f8fcf30b72226ed5e83975ed1b0665c5fcb3d77d626cc0e66d58f951d1cffb
 long_desc="
  This is the libX11 library that is the C binding to the X protocol. It
  is the foundation of practically every X Window System program out there.