diff --git a/tigervnc.changes b/tigervnc.changes
index 6b0db2c..042137b 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 31 13:48:16 UTC 2015 - dimstar@opensuse.org
+
+- Add /usr/sbin/groupadd and /usr/sbin/useradd Requires(post) to
+  xorg-x11-Xvnc: the scripts are creating users/groups.
+
 -------------------------------------------------------------------
 Wed Jul 15 11:52:02 UTC 2015 - msrb@suse.com
 
@@ -17,6 +23,13 @@ Wed Jul 15 11:52:02 UTC 2015 - msrb@suse.com
 - Work with fltk 1.3.2.
   * N_tigervnc_revert_fltk_1_3_3_requirements.patch
 
+-------------------------------------------------------------------
+Thu May 28 02:10:46 CEST 2015 - ro@suse.de
+
+- add buildrequires for xf86driproto and presentproto to
+  match xserver
+- disable dri2 on s390/s390x
+
 -------------------------------------------------------------------
 Mon Apr 20 12:10:10 UTC 2015 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index bcd1ca0..74ac0d7 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -72,6 +72,7 @@ BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(pciaccess) >= 0.8.0
 BuildRequires:  pkgconfig(pixman-1) >= 0.15.20
+BuildRequires:  pkgconfig(presentproto) >= 1.0
 BuildRequires:  pkgconfig(randrproto) >= 1.2.99.3
 BuildRequires:  pkgconfig(recordproto) >= 1.13.99.1
 BuildRequires:  pkgconfig(renderproto) >= 0.11
@@ -82,6 +83,7 @@ BuildRequires:  pkgconfig(xau)
 BuildRequires:  pkgconfig(xcmiscproto) >= 1.2.0
 BuildRequires:  pkgconfig(xdmcp)
 BuildRequires:  pkgconfig(xextproto) >= 7.0.99.3
+BuildRequires:  pkgconfig(xf86driproto) >= 2.1.1
 BuildRequires:  pkgconfig(xfont) >= 1.4.2
 BuildRequires:  pkgconfig(xineramaproto)
 BuildRequires:  pkgconfig(xkbfile)
@@ -127,6 +129,8 @@ TigerVNC also provides extensions for advanced authentication methods and TLS en
 %package -n xorg-x11-Xvnc
 # Needed to generate certificates
 Requires(post): openssl
+Requires(post): /usr/sbin/useradd
+Requires(post): /usr/sbin/groupadd
 # Needed to serve java applet
 Requires:       python
 Requires:       python-pyOpenSSL
@@ -174,7 +178,10 @@ autoreconf -fi
         --disable-static --disable-xinerama \
         --with-xkb-path="/usr/share/X11/xkb" \
         --with-xkb-output="/var/lib/xkb/compiled" \
-        --enable-glx --enable-dri --enable-dri2 \
+        --enable-glx --enable-dri \
+%ifnarch s390 s390x
+	--enable-dri2 \
+%endif
         --disable-config-dbus \
         --disable-config-hal \
         --disable-config-udev \
@@ -229,8 +236,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/tigervnc-*
 %find_lang '%{name}'
 
 %pre -n xorg-x11-Xvnc
-getent group %{vncgroup} > /dev/null || groupadd -r %{vncgroup}
-getent passwd %{vncuser} > /dev/null || useradd -r -g %{vncgroup} -d /var/lib/empty -s /sbin/nologin -c "user for VNC" %{vncuser}
+getent group %{vncgroup} > /dev/null || groupadd -r %{vncgroup} || :
+getent passwd %{vncuser} > /dev/null || useradd -r -g %{vncgroup} -d /var/lib/empty -s /sbin/nologin -c "user for VNC" %{vncuser} || :
 
 %post -n xorg-x11-Xvnc
 if ! test -e %{tlskey} ; then
@@ -291,7 +298,7 @@ fi
 
 %exclude /usr/%{_lib}/xorg/protocol.txt
 %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
-%ifnarch s390x
+%ifnarch s390 s390x
 %{_libdir}/xorg/modules/extensions/libvnc.so
 %else
 %exclude %{_libdir}/xorg/modules
@@ -304,7 +311,7 @@ fi
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 
-%ifnarch s390x
+%ifnarch s390 s390x
 %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
 %else
 %exclude /etc/X11/xorg.conf.d