diff --git a/tigervnc.changes b/tigervnc.changes
index a27f5f0..febbdb5 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 10 15:11:50 UTC 2014 - sndirsch@suse.com
+
+- do not include vnc Xserver module and xorg.conf snippet on s390x
+
 -------------------------------------------------------------------
 Thu Jan  9 11:40:13 UTC 2014 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 782abd5..fa5ea84 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -186,7 +186,9 @@ install -m644 com/tigervnc/vncviewer/index.vnc $RPM_BUILD_ROOT%{_datadir}/vnc/cl
 popd
 
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc
+%ifnarch s390x
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf
+%endif
 install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-server
 install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
@@ -221,14 +223,24 @@ install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
 
 %exclude /usr/%{_lib}/xorg/protocol.txt
 %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
+%ifnarch s390x
 %{_libdir}/xorg/modules/extensions/libvnc.so
+%else
+%exclude %{_libdir}/xorg/modules
+%exclude %{_libdir}/xorg/modules/extensions
+%exclude %{_libdir}/xorg/modules/extensions/libvnc.so
+%endif
 
 %exclude /var/lib/xkb/compiled/README.compiled
 
 /etc/sysconfig/SuSEfirewall2.d/services/vnc-server
 /etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 
+%ifnarch s390x
 %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
+%else
+%exclude /etc/X11/xorg.conf.d
+%endif
 %config(noreplace) /etc/xinetd.d/vnc
 %dir /etc/slp.reg.d
 %config(noreplace) /etc/slp.reg.d/vnc.reg