diff --git a/N_x86emu-include-order.patch b/N_x86emu-include-order.patch
new file mode 100644
index 0000000..52099da
--- /dev/null
+++ b/N_x86emu-include-order.patch
@@ -0,0 +1,47 @@
+Subject: [PATCH] Change include order to avoid conflict with system header
+From: Andreas Schwab <schwab@suse.de>
+
+R_SP is also defined in <sys/ucontext.h> on m68k.
+Also remove duplicate definitions.
+
+Signed-off-by: Andreas Schwab <schwab@suse.de>
+
+Index: xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
+===================================================================
+--- xorg-server-1.14.3.orig/hw/xfree86/int10/xf86x86emu.c
++++ xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
+@@ -7,7 +7,6 @@
+ #include <xorg-config.h>
+ #endif
+ 
+-#include <x86emu.h>
+ #include "xf86.h"
+ #include "compiler.h"
+ #include "xf86_OSproc.h"
+@@ -15,6 +14,7 @@
+ #define _INT10_PRIVATE
+ #include "xf86int10.h"
+ #include "int10Defines.h"
++#include <x86emu.h>
+ 
+ #define M _X86EMU_env
+ 
+Index: xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
+===================================================================
+--- xorg-server-1.14.3.orig/hw/xfree86/x86emu/x86emu/regs.h
++++ xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
+@@ -147,14 +147,6 @@ struct i386_segment_regs {
+ #define R_FLG spc.FLAGS
+ 
+ /* special registers */
+-#define R_SP  spc.SP.I16_reg.x_reg
+-#define R_BP  spc.BP.I16_reg.x_reg
+-#define R_SI  spc.SI.I16_reg.x_reg
+-#define R_DI  spc.DI.I16_reg.x_reg
+-#define R_IP  spc.IP.I16_reg.x_reg
+-#define R_FLG spc.FLAGS
+-
+-/* special registers */
+ #define R_ESP  spc.SP.I32_reg.e_reg
+ #define R_EBP  spc.BP.I32_reg.e_reg
+ #define R_ESI  spc.SI.I32_reg.e_reg
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index d8dec25..7d4271f 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  6 16:12:38 UTC 2013 - schwab@suse.de
+
+- N_x86emu-include-order.patch: Change include order to avoid conflict
+  with system header, remove duplicate definitions
+
 -------------------------------------------------------------------
 Fri Nov  1 13:46:06 UTC 2013 - msrb@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 2bab1ac..4547962 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -149,6 +149,8 @@ Patch211:       N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patc
 Patch213:       N_xorg-server-xdmcp.patch
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch222:       N_sync-fix.patch
+# PATCH-FIX-UPSTREAM N_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions
+Patch223:       N_x86emu-include-order.patch
 
 Patch226:       u_vgaHW-no-legacy.patch
 Patch228:       u_aarch64-support.patch
@@ -243,6 +245,7 @@ cp %{SOURCE96} .
 %patch213 -p1
 ### patch222 might not be applicable anymore
 #%patch222 -p1
+%patch223 -p1
 %patch226 -p0
 %patch228 -p1
 %patch229 -p1