diff --git a/xorg/libx11/libx11.conf b/xorg/libx11/libx11.conf
new file mode 100644
index 000000000..68ca05277
--- /dev/null
+++ b/xorg/libx11/libx11.conf
@@ -0,0 +1,21 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../libx11/libx11.conf
+# Copyright (C) 2012 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+if ! atstage native; then
+	make_native_makekeys() {
+		$MAKE -C src/util CC=$HOSTCC makekeys
+	}
+
+	hook_add premake 5 'make_native_makekeys'
+fi
diff --git a/xorg/libx11/makekeys.patch.cross b/xorg/libx11/makekeys.patch.cross
deleted file mode 100644
index 4a2d0c64e..000000000
--- a/xorg/libx11/makekeys.patch.cross
+++ /dev/null
@@ -1,27 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../libx11/makekeys.patch.cross
-# Copyright (C) 2010 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./src/util/Makefile.in.orig	2010-05-03 11:52:01.000000000 -0400
-+++ ./src/util/Makefile.in	2010-05-03 11:52:14.000000000 -0400
-@@ -55,7 +55,7 @@
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
- am__v_lt_0 = --silent
- makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(HOSTCC) $(makekeys_CFLAGS) \
- 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
- depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/xorg/libx11/sysroot.patch.cross b/xorg/libx11/sysroot.patch.cross
index 5c5669d04..d02416448 100644
--- a/xorg/libx11/sysroot.patch.cross
+++ b/xorg/libx11/sysroot.patch.cross
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../libx11/sysroot.patch.cross
-# Copyright (C) 2009 The OpenSDE Project
+# Copyright (C) 2009 - 2012 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -14,14 +14,14 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- ./configure.orig	2009-05-17 16:03:32.000000000 -0400
-+++ ./configure	2009-05-17 16:06:02.000000000 -0400
-@@ -24031,7 +24031,7 @@
- { echo "$as_me:$LINENO: checking keysymdef.h" >&5
- echo $ECHO_N "checking keysymdef.h... $ECHO_C" >&6; }
- dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+KEYSYMDEF="$PKG_CONFIG_SYSROOT_DIR$dir/X11/keysymdef.h"
- if test -f "$KEYSYMDEF"; then
-         { echo "$as_me:$LINENO: result: $KEYSYMDEF" >&5
- echo "${ECHO_T}$KEYSYMDEF" >&6; }
+--- ./configure.orig	2012-02-07 10:53:09.000000000 +0100
++++ ./configure	2012-02-07 10:53:39.000000000 +0100
+@@ -14255,7 +14255,7 @@
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5
+ $as_echo_n "checking keysym definitions... " >&6; }
+-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