diff --git a/tigervnc.changes b/tigervnc.changes
index 9ae0298..a3bf2a8 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug  6 12:04:52 UTC 2018 - msrb@suse.com
+
+- Add xvnc.target to fix xvnc-novnc.service's dependency.
+  (bnc#1103552)
+- Split the X server's VNC module into subpackage and give it
+  dependency on the current extension ABI.
+
 -------------------------------------------------------------------
 Thu Aug  2 08:31:09 UTC 2018 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 1f1d3b2..b21e68f 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -126,6 +126,7 @@ Source15:       xvnc-novnc.service
 Source16:       xvnc-novnc.socket
 Source17:       tigervnc.firewalld
 Source18:       tigervnc-https.firewalld
+Source19:       xvnc.target
 
 Patch1:         tigervnc-newfbsize.patch
 Patch2:         tigervnc-clean-pressed-key-on-exit.patch
@@ -164,6 +165,7 @@ Requires:       xorg-x11-fonts-core
 # For the with-vnc-key.sh script
 Requires:       /bin/hostname
 %{?systemd_requires}
+Recommends:     xorg-x11-Xvnc-module
 Provides:       tightvnc = 1.3.9
 Provides:       xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
 Obsoletes:      tightvnc < 1.3.9
@@ -173,6 +175,17 @@ Group:          System/X11/Servers/XF86_4
 %description -n xorg-x11-Xvnc
 This is the TigerVNC implementation of Xvnc.
 
+%package -n xorg-x11-Xvnc-module
+Requires:       xorg-x11-Xvnc
+Summary:        VNC module for X server
+Group:          System/X11/Servers/XF86_4
+%{x11_abi_extension_req}
+
+%description -n xorg-x11-Xvnc-module
+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.
+
 %package -n xorg-x11-Xvnc-novnc
 Requires:       novnc
 Requires:       python-websockify
@@ -332,6 +345,7 @@ install -D %{SOURCE13} -m 0444 %{buildroot}%{_unitdir}/xvnc@.service
 install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket
 install -D %{SOURCE15} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service
 install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket
+install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target
 
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/tigervnc-*
 
@@ -455,18 +469,9 @@ fi
 
 %{_unitdir}/xvnc@.service
 %{_unitdir}/xvnc.socket
+%{_unitdir}/xvnc.target
 %{_sbindir}/rcxvnc
 
-%exclude /usr/%{_lib}/xorg/protocol.txt
-%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
-%ifnarch s390 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
 
 %if %{use_firewalld}
@@ -479,11 +484,6 @@ fi
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 %endif
 
-%ifnarch s390 s390x
-%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
-%else
-%exclude /etc/X11/xorg.conf.d
-%endif
 %dir /etc/slp.reg.d
 %config(noreplace) /etc/slp.reg.d/vnc.reg
 
@@ -495,6 +495,19 @@ fi
 
 %{_libexecdir}/vnc
 
+%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
 %{_unitdir}/xvnc-novnc.service
 %{_unitdir}/xvnc-novnc.socket
diff --git a/xvnc-novnc.service b/xvnc-novnc.service
index 14a3690..f16fc55 100644
--- a/xvnc-novnc.service
+++ b/xvnc-novnc.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=noVNC Web Server
-Requires=xvnc.socket
-After=xvnc.socket
+Requires=xvnc.target
+After=xvnc.target
 
 [Service]
 ExecStart=/usr/lib/vnc/with-vnc-key.sh /usr/bin/websockify --key /etc/vnc/tls.key --cert /etc/vnc/tls.cert --web /usr/share/novnc --inetd localhost:5901
diff --git a/xvnc.socket b/xvnc.socket
index 1bbca04..27537ea 100644
--- a/xvnc.socket
+++ b/xvnc.socket
@@ -1,5 +1,7 @@
 [Unit]
 Description=Xvnc Server
+Before=xvnc.target
+Wants=xvnc.target
 
 [Socket]
 ListenStream=5901
diff --git a/xvnc.target b/xvnc.target
new file mode 100644
index 0000000..ca42c97
--- /dev/null
+++ b/xvnc.target
@@ -0,0 +1,2 @@
+[Unit]
+Description=System VNC service