diff --git a/tigervnc.changes b/tigervnc.changes
index afdd367..5fa73ec 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Mon May  3 09:19:17 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Do not carry two variants of the same servcice file, but rather
+  bring a template which we dynamically adjust during installation
+  to cater for the correct libexecdir value.
+  + Replace xvnc-novnc-libexec.service and xvnc-novnc-lib.service
+    with xvnc-novnc.service.in.
+
+-------------------------------------------------------------------
+Mon May  3 08:54:23 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
+
+- package both xvnc-novnc-libexec.service and xvnc-novnc-lib.service
+  source files
+
+-------------------------------------------------------------------
+Tue Apr 27 13:41:26 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Adjusting suse_version check from '> 1500' to '>= 1550' per request.
+
+-------------------------------------------------------------------
+Fri Apr 23 14:26:45 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Adding if statement to control libexec (Tumbleweed +) vs lib based
+  'Source#' file for 'xvnc-novnc.service'.
+
+-------------------------------------------------------------------
+Thu Apr 22 18:30:29 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- 'xvnc-novnc.service' requires '/usr/libexec/vnc/with-vnc-key.sh'
+  vs '/usr/lib/vnc/with-vnc-key.sh' for ExecStart to work correctly.
+
 -------------------------------------------------------------------
 Fri Mar  5 14:46:02 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 37abffd..c72ba21 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -108,8 +108,8 @@ BuildRequires:  pkgconfig(xorg-macros) >= 1.14
 BuildRequires:  pkgconfig(xproto)  >= 7.0.17
 BuildRequires:  pkgconfig(xtrans) >= 1.2.2
 %if 0%{?suse_version} >= 1315
-Requires(post):   update-alternatives
-Requires(postun): update-alternatives
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
 %endif
 URL:            http://tigervnc.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -128,12 +128,11 @@ Source11:       index.vnc
 Source12:       x11vnc
 Source13:       xvnc@.service
 Source14:       xvnc.socket
-Source15:       xvnc-novnc.service
 Source16:       xvnc-novnc.socket
 Source17:       tigervnc.firewalld
 Source18:       tigervnc-https.firewalld
 Source19:       xvnc.target
-
+Source21:       xvnc-novnc.service.in
 Patch1:         tigervnc-newfbsize.patch
 Patch2:         tigervnc-clean-pressed-key-on-exit.patch
 Patch3:         u_tigervnc-ignore-epipe-on-write.patch
@@ -280,6 +279,7 @@ popd
 %build
 export CXXFLAGS="%optflags"
 export CFLAGS="%optflags"
+sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service
 # Build all tigervnc
 cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 make %{?_smp_mflags}
@@ -365,9 +365,9 @@ install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc
 
 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
+install -D xvnc-novnc.service -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service
 
 rm -rf %{buildroot}%{_datadir}/doc/tigervnc-*
 
diff --git a/xvnc-novnc.service b/xvnc-novnc.service
deleted file mode 100644
index f16fc55..0000000
--- a/xvnc-novnc.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=noVNC Web Server
-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
-User=vnc
-StandardInput=socket
-StandardError=syslog
diff --git a/xvnc-novnc.service.in b/xvnc-novnc.service.in
new file mode 100644
index 0000000..26ee7fb
--- /dev/null
+++ b/xvnc-novnc.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=noVNC Web Server
+Requires=xvnc.target
+After=xvnc.target
+
+[Service]
+ExecStart=@LIBEXECDIR@/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
+User=vnc
+StandardInput=socket
+StandardError=syslog