diff --git a/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch b/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch
new file mode 100644
index 0000000..48dec37
--- /dev/null
+++ b/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch
@@ -0,0 +1,39 @@
+From b275bb75020c653598bf510d2c9b566543666f8a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
+Date: Mon, 16 Nov 2015 10:52:49 +0100
+Subject: [PATCH v2] Xorg.wrap: activate libdrm based detection for KMS drivers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers.
+Unfortunately it is never activated since code missed to include file
+which defines WITH_LIBDRM.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894
+Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+Changes in v2:
+-Fix bugzilla reference in commit message
+-Add Michel Dänzer's Reviewed-by
+---
+ hw/xfree86/xorg-wrapper.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
+index 4c37cfc..d930962 100644
+--- a/hw/xfree86/xorg-wrapper.c
++++ b/hw/xfree86/xorg-wrapper.c
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include "dix-config.h"
++#include "xorg-config.h"
+ 
+ #include <errno.h>
+ #include <fcntl.h>
+-- 
+2.5.0
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 29ec40b..4462451 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -45,7 +45,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.18.0
-Release:   1%{?gitdate:.%{gitdate}}%{dist}
+Release:   2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -91,6 +91,9 @@ Patch7027: xserver-autobind-hotplug.patch
 # submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
 Patch9100: exa-only-draw-valid-trapezoids.patch
 
+# submitted: http://lists.freedesktop.org/archives/xorg-devel/2015-November/047811.html
+Patch9200: 0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch
+
 # because the display-managers are not ready yet, do not upstream
 Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
 
@@ -630,6 +633,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Mon Nov 16 2015 Hans de Goede <hdegoede@redhat.com> - 1.18.0-2
+- Fix Xorg.wrap kms detection to so that the server does not always run
+  as root
+
 * Mon Nov 09 2015 Adam Jackson <ajax@redhat.com> 1.18.0-1
 - xserver 1.18.0