diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
index a31fde42f2..7b073fc15d 100755
--- a/packages/x11/lib/libX11/build
+++ b/packages/x11/lib/libX11/build
@@ -42,6 +42,7 @@ cd $PKG_BUILD
             --enable-xlocale \
             --disable-xlocaledir \
             --enable-xkb \
+            --with-keysymdefdir="$SYSROOT_PREFIX/usr/include/X11" \
             --disable-xf86bigfont \
             --enable-malloc0returnsnull \
             --disable-specs \
diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/meta
index 691b5db935..f53cfa73c3 100644
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libX11"
-PKG_VERSION="1.5.0"
+PKG_VERSION="1.6.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/x11/lib/libX11/patches/libX11-1.5.0-disable_nls_tests.patch b/packages/x11/lib/libX11/patches/libX11-1.5.0-disable_nls_tests.patch
deleted file mode 100644
index a3217eed44..0000000000
--- a/packages/x11/lib/libX11/patches/libX11-1.5.0-disable_nls_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur libX11-1.5.0-old/nls/Makefile.am libX11-1.5.0-new/nls/Makefile.am
---- libX11-1.5.0-old/nls/Makefile.am	2012-06-01 23:37:18.000000000 -0700
-+++ libX11-1.5.0-new/nls/Makefile.am	2012-12-29 04:47:12.000000000 -0800
-@@ -36,10 +36,10 @@
-         < locale.dir.l1 > locale.dir.l2
- 	cat locale.dir.l2 locale.dir.l1 > locale.dir
- 
--if HAVE_PERL
--TESTS_ENVIRONMENT = $(PERL)
--TESTS = $(srcdir)/compose-check.pl
--endif HAVE_PERL
-+# if HAVE_PERL
-+# TESTS_ENVIRONMENT = $(PERL)
-+# TESTS = $(srcdir)/compose-check.pl
-+# endif HAVE_PERL
- 
- 
- # Per-locale data files
diff --git a/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch b/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch
deleted file mode 100644
index 2f03f45302..0000000000
--- a/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libX11-1.5.0-old/configure.ac libX11-1.5.0-new/configure.ac
---- libX11-1.5.0-old/configure.ac	2012-06-01 23:37:17.000000000 -0700
-+++ libX11-1.5.0-new/configure.ac	2012-06-02 09:13:08.000000000 -0700
-@@ -35,6 +35,7 @@
- 
- # Required when PKG_CHECK_MODULES called within an if statement
- PKG_PROG_PKG_CONFIG
-+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
- 
- if test x"$CC_FOR_BUILD" = x; then
- 	if test x"$cross_compiling" = xyes; then
-@@ -306,7 +307,7 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysym definitions])
--KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+KEYSYMDEFDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`/X11
- FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
- for i in $FILES; do
-     if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/packages/x11/lib/libX11/patches/libX11-disable_nls_tests.patch b/packages/x11/lib/libX11/patches/libX11-disable_nls_tests.patch
new file mode 100644
index 0000000000..3afa79a753
--- /dev/null
+++ b/packages/x11/lib/libX11/patches/libX11-disable_nls_tests.patch
@@ -0,0 +1,18 @@
+diff -Naur libX11-1.6.0/nls/Makefile.am libX11-1.6.0.patch/nls/Makefile.am
+--- libX11-1.6.0/nls/Makefile.am	2013-06-04 04:21:16.000000000 +0200
++++ libX11-1.6.0.patch/nls/Makefile.am	2013-06-04 17:07:11.962522739 +0200
+@@ -36,10 +36,10 @@
+         < locale.dir.l1 > locale.dir.l2
+ 	cat locale.dir.l2 locale.dir.l1 > locale.dir
+ 
+-if HAVE_PERL
+-LOG_COMPILER = $(PERL)
+-TESTS = compose-check.pl
+-endif HAVE_PERL
++# if HAVE_PERL
++# LOG_COMPILER = $(PERL)
++# TESTS = compose-check.pl
++# endif HAVE_PERL
+ 
+ 
+ # Per-locale data files