diff --git a/wsdd.changes b/wsdd.changes
index f77a9e1..18999dc 100644
--- a/wsdd.changes
+++ b/wsdd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Aug 29 13:41:40 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>
+
+- Fix use of /usr/lib and /usr/libexec
+
 -------------------------------------------------------------------
 Mon Jul  6 20:09:48 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>
 
diff --git a/wsdd.service b/wsdd.service.in
similarity index 91%
rename from wsdd.service
rename to wsdd.service.in
index 1efd8e0..48353f6 100644
--- a/wsdd.service
+++ b/wsdd.service.in
@@ -8,7 +8,7 @@ Type=simple
 AmbientCapabilities=CAP_SYS_CHROOT
 PermissionsStartOnly=true
 Environment= WSDD_ARGS=-p
-ExecStartPre=/usr/lib/wsdd/wsdd-init.sh
+ExecStartPre=@LIBEXECDIR@/wsdd-init.sh
 EnvironmentFile=-/run/sysconfig/wsdd
 ExecStart=/usr/sbin/wsdd --shortlog -c /run/wsdd $WSDD_ARGS
 ExecStartPost=/usr/bin/rm /run/sysconfig/wsdd
diff --git a/wsdd.spec b/wsdd.spec
index 7a44bed..50de190 100644
--- a/wsdd.spec
+++ b/wsdd.spec
@@ -25,7 +25,7 @@ Url:            https://github.com/christgau/wsdd
 BuildArch:	noarch
 Source:         https://github.com/christgau/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
 Source1:	%{name}-init.sh
-Source2:	%{name}.service
+Source2:	%{name}.service.in
 Source3:	%{name}.xml
 Source4:	sysconfig.%{name}
 Source5:	%{name}.conf
@@ -53,13 +53,14 @@ for devices running Samba, like NAS or file sharing servers on your local networ
 %install
 install -m 755 -D src/wsdd.py %{buildroot}%{_sbindir}/%{name}
 install -m 644 -D man/wsdd.1 %{buildroot}/%{_mandir}/man1/wsdd.1
-install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd/wsdd-init.sh
-install -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/wsdd.service
-install -m 644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/firewalld/services/wsdd.xml
+install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd-init.sh
+mkdir -p %{buildroot}%{_unitdir}
+sed 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} >%{buildroot}%{_unitdir}/wsdd.service
+install -m 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/firewalld/services/wsdd.xml
 install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd
 install -m 755 -d %{buildroot}%{_sbindir}
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
-mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
+mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d/
 install -m 644 %{SOURCE5} %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p %{buildroot}/run/wsdd
 mkdir -p %{buildroot}/var/lib/wsdd
@@ -88,12 +89,13 @@ getent passwd wsdd >/dev/null || %{_sbindir}/useradd -r -g wsdd -c "User for wsd
 %{_mandir}/man1/wsdd.1.gz
 %{_sbindir}/rc%{name}
 %{_unitdir}/wsdd.service
-%{_libexecdir}/wsdd
-%dir /usr/lib/tmpfiles.d
-/usr/lib/tmpfiles.d/wsdd.conf
-%dir %{_libexecdir}/firewalld
-%dir %{_libexecdir}/firewalld/services
-%{_libexecdir}/firewalld/services/wsdd.xml
+%dir %{_libexecdir}
+%{_libexecdir}/wsdd-init.sh
+%dir %{_prefix}/lib/tmpfiles.d
+%{_prefix}/lib/tmpfiles.d/wsdd.conf
+%dir %{_prefix}/lib/firewalld
+%dir %{_prefix}/lib/firewalld/services
+%{_prefix}/lib/firewalld/services/wsdd.xml
 %{_fillupdir}/sysconfig.%{name}
 %dir %attr(0755,wsdd,wsdd) %ghost /run/sysconfig
 %attr(0644,wsdd,wsdd) %ghost /run/sysconfig/wsdd