diff --git a/modesetting.ids b/modesetting.ids
new file mode 100644
index 0000000..25ddd5f
--- /dev/null
+++ b/modesetting.ids
@@ -0,0 +1,47 @@
+#SKL
+80861916
+80861921
+8086191E
+80861912
+8086191B
+8086191A
+8086191D
+80861923
+80861926
+80861927
+8086192B
+8086192A
+80861932
+8086193B
+8086193D
+8086193A
+#BXT
+80860A84
+80861A84
+80861A85
+80865A84
+80865A85
+#KBL
+80865913
+80865915
+80865917
+80865906
+8086590E
+80865902
+8086590B
+8086590A
+80865916
+80865921
+8086591E
+80865912
+8086591B
+8086591A
+8086591D
+80865926
+8086592B
+8086592A
+80865932
+8086593B
+8086593A
+8086593D
+#
\ No newline at end of file
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index fd1d543..8e5795a 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun May  8 22:11:49 UTC 2016 - eich@suse.com
+
+- modesetting.ids:
+  Add file for PCI IDs of ASICs which the modesetting rather
+  than the native driver should be used for.
+  This includes all Intel Gen9+ hardware (boo#978954).
+
 -------------------------------------------------------------------
 Mon May  2 13:46:34 UTC 2016 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 95a72ba..bbe9b72 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -54,6 +54,7 @@ Source2:        README.updates
 Source3:        xorgcfg.tar.bz2
 Source4:        xorg-backtrace
 Source5:        50-extensions.conf
+Source6:        modesetting.ids
 # RPM Macros to be installed. The ABI Versions will be injected by configure.
 Source90:       xorg-x11-server.macros.in
 # Source91 and Source99 are used to ensure proper ABI provides.
@@ -437,6 +438,7 @@ chmod u-s %{buildroot}%{_bindir}/Xorg
 mkdir -p %{buildroot}%{_localstatedir}/lib/X11
 %if 0%{?pci_ids_dir:1}
 %__mkdir_p %{buildroot}%{pci_ids_dir}
+install -m 644 %{S:6} %{buildroot}%{pci_ids_dir}
 %endif
 ln -snf ../../../usr/bin/Xorg %{buildroot}%{_localstatedir}/lib/X11/X
 ln -snf ../../var/lib/X11/X %{buildroot}%{_bindir}/X
@@ -538,6 +540,7 @@ fi
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %if 0%{?pci_ids_dir:1}
 %dir %{pci_ids_dir}
+%{pci_ids_dir}/modesetting.ids
 %endif
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf