diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index 4db5b8f9..4d72a979 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -206,6 +206,20 @@ extract_it()
 
     # patch and configure module - we only need to do this once
     cd $mod_name
+    # replace config.guess
+    if [ -e build/config.guess ]; then
+      cp -Rp /usr/share/misc/config.guess build/
+    elif [ -e build-aux/config.guess ]; then
+      cp -Rp /usr/share/misc/config.guess build-aux/
+    elif [ -e bin/config.guess ]; then
+      cp -Rp /usr/share/misc/config.guess bin/
+    elif [ -e conftools/config.guess ]; then
+      cp -Rp /usr/share/misc/config.guess conftools/
+    elif [ -e builds/unix/config.guess ]; then
+      cp -Rp /usr/share/misc/config.guess builds/unix/
+    else
+      cp -Rp /usr/share/misc/config.guess .
+    fi
     # check for patches
     if [ -e ../../$mod_name.patch ]; then
       patch -p1 < ../../$mod_name.patch
diff --git a/xorg/X11R7.6/libdrm-2.4.26.patch b/xorg/X11R7.6/libdrm-2.4.26.patch
new file mode 100644
index 00000000..bf78e6fc
--- /dev/null
+++ b/xorg/X11R7.6/libdrm-2.4.26.patch
@@ -0,0 +1,11 @@
+diff -ur a/libkms/linux.c b/libkms/linux.c
+--- a/libkms/linux.c
++++ b/libkms/linux.c
+@@ -39,6 +39,7 @@
+ #include <unistd.h>
+ 
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "internal.h"
+