diff --git a/tigervnc.changes b/tigervnc.changes
index c1f523b..01bbbda 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com
+
+- u_xserver118.patch
+  * Build with xserver 1.18.0.
+
 -------------------------------------------------------------------
 Thu Oct  1 23:16:52 UTC 2015 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index b9579d1..a328c75 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -120,6 +120,7 @@ Patch10:        u_tigervnc-add-autoaccept-parameter.patch
 Patch11:        N_tigervnc_revert_fltk_1_3_3_requirements.patch
 Patch12:        U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
 Patch13:        u_tigervnc-vncserver-clean-pid-files.patch
+Patch14:        u_xserver118.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -163,6 +164,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver117.patch
diff --git a/u_xserver118.patch b/u_xserver118.patch
new file mode 100644
index 0000000..72c32ec
--- /dev/null
+++ b/u_xserver118.patch
@@ -0,0 +1,35 @@
+Subject: Support X server 1.18.0
+Author: Michal Srb <msrb@suse.com>
+Patch-Mainline: To be upstreamed
+
+diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
+index 8cc1c86..60610cb 100644
+--- a/unix/xserver/hw/vnc/xorg-version.h
++++ b/unix/xserver/hw/vnc/xorg-version.h
+@@ -48,8 +48,10 @@
+ #define XORG 116
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
+ #define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.17 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+ 
+ #endif
+index 4c90a95..55befa7 100644
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -300,8 +300,10 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg
+ #if XORG < 111
+ 	n = GetKeyboardEvents(eventq, dev, action, kc);
+ 	enqueueEvents(dev, n);
+-#else
++#elif XORG < 118
+ 	QueueKeyboardEvents(dev, action, kc, NULL);
++#else
++	QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+