diff --git a/u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch b/u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch
deleted file mode 100644
index b273533..0000000
--- a/u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2c36b0001729fa2c22255777bce66b99adc6c568 Mon Sep 17 00:00:00 2001
-From: Stefan Dirsch <sndirsch@suse.de>
-Date: Mon, 16 Feb 2015 15:00:54 +0100
-Subject: [PATCH] ad hoc fix for mmap's truncated offset parameter on 32bit
-
-Builtin modesetting driver didn't work on 32bit on cirrus KMS.
-See https://bugzilla.suse.com/show_bug.cgi?id=917385 for more details.
----
- hw/xfree86/drivers/modesetting/dumb_bo.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/xfree86/drivers/modesetting/dumb_bo.c b/hw/xfree86/drivers/modesetting/dumb_bo.c
-index 58d420e..95b34a2 100644
---- a/hw/xfree86/drivers/modesetting/dumb_bo.c
-+++ b/hw/xfree86/drivers/modesetting/dumb_bo.c
-@@ -25,6 +25,12 @@
- #include "dix-config.h"
- #endif
- 
-+/*
-+ * ad hoc fix for mmap's truncated offset parameter on 32bit
-+ * see also https://bugzilla.suse.com/show_bug.cgi?id=917385
-+ */
-+#define _FILE_OFFSET_BITS 64
-+
- #include "dumb_bo.h"
- 
- #include <errno.h>
--- 
-1.8.4.5
-
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index be8b1b9..2794a37 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 29 08:40:24 UTC 2016 - sndirsch@suse.com
+
+- removed no longer needed patch
+  u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch, see
+  https://lists.x.org/archives/xorg-devel/2016-April/049493.html for
+  upstream discussion; obsoleted by upstream patch
+  https://cgit.freedesktop.org/xorg/xserver/commit/?id=4962c8c08842d9d3ca66d254b1ce4cacc4fb3756, which is already in xorg-server 1.18.3
+
 -------------------------------------------------------------------
 Tue Apr 12 15:33:45 UTC 2016 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index de43113..a74ad54 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -191,7 +191,6 @@ Patch104:       u_xorg-server-xdmcp.patch
 Patch106:       u_exa-only-draw-valid-trapezoids.patch
 Patch112:       u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
 
-Patch114:       u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch
 Patch115:       N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch
 
 Patch117:       xorg-x11-server-byte-order.patch
@@ -329,7 +328,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
 
 %patch112 -p1
 
-%patch114 -p1
 %patch115 -p1
 
 %patch117 -p1