diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 9588805..2e05c1f 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 12:22:28 UTC 2016 - eich@suse.com
+
+- Add support for a driver specific psi IDs files supplementing
+  what's in xf86VideoPtrToDriverList() (boo#972126).
+
 -------------------------------------------------------------------
 Sat Mar 12 00:31:53 UTC 2016 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 662f47c..c777c90 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,6 +21,7 @@
 %else
 %if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
 %define have_wayland 1
+%define pci_ids_dir %{_sysconfdir}/X11/xorg.ids
 %endif
 %endif
 
@@ -327,6 +328,9 @@ test -e source-file-list || \
     source-file-list
 
 autoreconf -fi
+%if 0%{?pci_ids_dir:1}
+export PCI_TXT_IDS_DIR=%{pci_ids_dir}
+%endif
 %configure CFLAGS="%{optflags} -fno-strict-aliasing" \
 	    --sysconfdir=/etc \
             --enable-xdmcp \
@@ -393,18 +397,19 @@ install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
 # bnc #632737
 chmod u-s %{buildroot}%{_bindir}/Xorg
 mkdir -p %{buildroot}%{_localstatedir}/lib/X11
+%if 0%{?pci_ids_dir:1}
+%__mkdir_p %{buildroot}%{pci_ids_dir}
+%endif
 ln -snf ../../../usr/bin/Xorg %{buildroot}%{_localstatedir}/lib/X11/X
 ln -snf ../../var/lib/X11/X %{buildroot}%{_bindir}/X
 %if 0%{?suse_version} > 1120
 # get rid of evdev config file, since it's meanwhile shipped with
 # evdev driver itself (since 2.10.0)
 rm -f %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf
-%ifnarch s390 s390x
 mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
 cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-quirks.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 %{__install} -m 644 %{S:5} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 %endif
-%endif
 %if 0%{?suse_version} < 1315
 mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
 install -m 644 $RPM_SOURCE_DIR/README.updates %{buildroot}%{_libdir}/xorg/modules/updates
@@ -485,6 +490,9 @@ fi
 %ifnarch s390 s390x
 %if 0%{?suse_version} > 1120
 %dir %{_sysconfdir}/X11/xorg.conf.d
+%if 0%{?pci_ids_dir:1}
+%dir %{pci_ids_dir}
+%endif
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf
 %dir %{_datadir}/X11/xorg.conf.d