diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index 5c879aa1..499f3435 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -1,7 +1,10 @@
 #!/bin/sh -e
 
+patch -p1 < rootless_modesetting.patch
+
 ./configure \
     --prefix=/usr \
+    --localstatedir=/var \
     --disable-systemd-logind \
     --disable-xwayland \
     --disable-unit-tests \
@@ -20,6 +23,3 @@ make
 make DESTDIR="$1" install
 
 rm -f "$1/usr/share/X11/xorg.conf.d/10-evdev.conf"
-
-# Set suid for xorg.
-chmod u+s "$1/usr/bin/Xorg"
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index 111f24d3..13ffb417 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1 +1,2 @@
 a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d  xorg-server-1.20.5.tar.bz2
+c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129  rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index af95e83d..51901117 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -1,3 +1,4 @@
+bzip2
 eudev
 freetype-harfbuzz
 libX11
@@ -19,4 +20,5 @@ mesa
 pixman
 xinit
 xkeyboard-config
-xtrans
+xtrans make
+zlib
diff --git a/xorg/xorg-server/patches/rootless_modesetting.patch b/xorg/xorg-server/patches/rootless_modesetting.patch
new file mode 100644
index 00000000..d578208d
--- /dev/null
+++ b/xorg/xorg-server/patches/rootless_modesetting.patch
@@ -0,0 +1,14 @@
+--- xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
++++ xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
+@@ -1528,6 +1528,10 @@
+     if (ms->fd_passed)
+         return TRUE;
+
++    ret = drmIsMaster(ms->fd);
++    if (ret)
++      return TRUE;
++
+     ret = drmSetMaster(ms->fd);
+     if (ret)
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "drmSetMaster failed: %s\n",
+
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index c62c0c94..b37ea2a0 100644
--- a/xorg/xorg-server/sources
+++ b/xorg/xorg-server/sources
@@ -1 +1,2 @@
 https://www.x.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2
+patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index 4621c171..1a2ccd32 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-1.20.5 7
+1.20.5 8