diff --git a/06_use-intel-only-on-pre-gen4.diff b/06_use-intel-only-on-pre-gen4.diff
new file mode 100644
index 0000000..4994492
--- /dev/null
+++ b/06_use-intel-only-on-pre-gen4.diff
@@ -0,0 +1,30 @@
+Description: Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting
+Author: Timo Aaltonen <tjaalton@debian.org>
+
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_devi
+ 		case 0x0bef:
+ 			/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
+ 			break;
+-		default:
++		/* Default to intel only on pre-gen4 chips */
++		case 0x3577:
++		case 0x2562:
++		case 0x3582:
++		case 0x358e:
++		case 0x2572:
++		case 0x2582:
++		case 0x258a:
++		case 0x2592:
++		case 0x2772:
++		case 0x27a2:
++		case 0x27ae:
++		case 0x29b2:
++		case 0x29c2:
++		case 0x29d2:
++		case 0xa001:
++		case 0xa011:
+ 			driverList[0] = "intel";
+ 			break;
+         }
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 673bd2d..5f464d2 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.19.0
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Release:   4%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -96,6 +96,9 @@ Patch15: 0005-xfree86-Allow-overriding-primary-GPU-detection-from-.patch
 Patch16: 0006-xfree86-Add-ModulePath-support-for-OutputClass-confi.patch
 Patch17: 0001-glamor-glamor_egl_get_display-Return-NULL-if-eglGetP.patch
 
+# From Debian use intel ddx driver only for gen4 and older chipsets
+Patch20: 06_use-intel-only-on-pre-gen4.diff
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=1389886
 Patch21: 0001-Revert-damage-Make-damageRegionProcessPending-take-a.patch
 
@@ -605,6 +608,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Tue Jan 10 2017 Hans de Goede <hdegoede@redhat.com> - 1.19.0-4
+- Follow Debian and only default to the intel ddx on gen4 or older intel GPUs
+
 * Tue Dec 20 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-3
 - Add one more patch for better integration with the nvidia binary driver