diff --git a/tigervnc.changes b/tigervnc.changes
index 1cb4d0f..4403a6c 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 17 12:07:27 UTC 2019 - msrb@suse.com
+
+- Switch websocket dependency to python3. (bsc#1119737)
+
+-------------------------------------------------------------------
+Thu Jan 17 10:21:29 UTC 2019 - msrb@suse.com
+
+- Do not build xorg-x11-Xvnc-module on s390. It fails to build
+  because macros.xorg-server is incomplete on s390 and the module
+  would be useless without real X server anyway.
+
 -------------------------------------------------------------------
 Tue Jan  8 12:38:42 UTC 2019 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 45c7bfe..ef77650 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -166,7 +166,9 @@ Requires:       openssl(cli)
 # For the with-vnc-key.sh script
 Requires:       /bin/hostname
 %{?systemd_requires}
+%ifnarch s390 s390x
 Recommends:     xorg-x11-Xvnc-module
+%endif
 Provides:       tightvnc = 1.3.9
 Provides:       xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
 Obsoletes:      tightvnc < 1.3.9
@@ -176,6 +178,7 @@ Group:          System/X11/Servers/XF86_4
 %description -n xorg-x11-Xvnc
 This is the TigerVNC implementation of Xvnc.
 
+%ifnarch s390 s390x
 %package -n xorg-x11-Xvnc-module
 Requires:       xorg-x11-Xvnc
 Summary:        VNC module for X server
@@ -186,10 +189,11 @@ Group:          System/X11/Servers/XF86_4
 This module allows to share content of X server's screen over VNC.
 It is loaded into X server as a module if enable in X server's
 configuration.
+%endif
 
 %package -n xorg-x11-Xvnc-novnc
 Requires:       novnc
-Requires:       python-websockify
+Requires:       python3-websockify
 Requires:       xorg-x11-Xvnc
 %{?systemd_requires}
 Summary:        NoVNC service for Xvnc
@@ -497,17 +501,19 @@ fi
 
 %{_libexecdir}/vnc
 
+%ifarch s390 s390x
+# These would be in xorg-x11-Xvnc-module, but we don't build that on s390
+%exclude /usr/%{_lib}/xorg/protocol.txt
+%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
+%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.so
+%endif
+
+%ifnarch s390 s390x
 %files -n xorg-x11-Xvnc-module
 %exclude /usr/%{_lib}/xorg/protocol.txt
 %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
-%ifnarch s390 s390x
 %{_libdir}/xorg/modules/extensions/libvnc.so
 %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
-%else
-%exclude /etc/X11/xorg.conf.d
-%exclude %{_libdir}/xorg/modules
-%exclude %{_libdir}/xorg/modules/extensions
-%exclude %{_libdir}/xorg/modules/extensions/libvnc.so
 %endif
 
 %files -n xorg-x11-Xvnc-novnc