diff --git a/templates/libX11/depends b/templates/libX11/depends
new file mode 100644
index 00000000000..80ce1443c5b
--- /dev/null
+++ b/templates/libX11/depends
@@ -0,0 +1,2 @@
+abi_depends=1.2
+api_depends=${abi_depends}
diff --git a/templates/libX11/template b/templates/libX11/template
index ab5aa1cb6dc..b849b86e818 100644
--- a/templates/libX11/template
+++ b/templates/libX11/template
@@ -1,18 +1,27 @@
+# Template build file for 'libX11'.
 pkgname=libX11
-version=1.1.5
+version=1.2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--without-xcb"
+configure_args="--without-xcb --enable-xlocaledir --enable-loadable-i18n"
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
+checksum=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 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.
 
  This is from the modular X.org X11 project."
 
-shared_deps="libXdmcp-1.0 libXau-1.0"
-build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xtrans-1.2
- xcmiscproto-1.1 kbproto-1.0 bigreqsproto-1.0 inputproto-1.4 ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xextproto
+Add_dependency build xtrans
+Add_dependency build xcmiscproto
+Add_dependency build kbproto
+Add_dependency build bigreqsproto
+Add_dependency build inputproto
+Add_dependency build xf86bigfontproto
+Add_dependency full glibc
+Add_dependency full libXdmcp
+Add_dependency full libXau