diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
index 1651f8628..6ce531343 100644
--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
@@ -143,8 +143,7 @@ make check VERBOSE=1
 %doc README.md AUTHORS NEWS
 %license COPYING
 %config(noreplace)%{_sysconfdir}/fwupd.conf
-%dir %{_libexecdir}/fwupd
-%{_libexecdir}/fwupd/fwupd
+%{_libexecdir}/fwupd
 %{_bindir}/fwupdmgr
 %{_sysconfdir}/pki/fwupd
 %{_sysconfdir}/pki/fwupd-metadata
diff --git a/data/Makefile.am b/data/Makefile.am
index 41837ca07..a57a8152c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,7 +17,7 @@ $(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile
 	sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@
 
 %.service: %.service.in Makefile
-	$(AM_V_GEN)sed -e 's|\@servicedir\@|$(libexecdir)|' \
+	$(AM_V_GEN)sed -e 's|\@libexecdir\@|$(libexecdir)|' \
 	               -e 's|\@localstatedir\@|$(localstatedir)|' \
 	               -e 's|\@bootdir\@|$(bootdir)|' \
 	               -e 's|\@bindir\@|$(bindir)|' \
diff --git a/data/fwupd.service.in b/data/fwupd.service.in
index 987aeabc4..7c3d26a18 100644
--- a/data/fwupd.service.in
+++ b/data/fwupd.service.in
@@ -7,7 +7,7 @@ Before=gdm.service
 [Service]
 Type=dbus
 BusName=org.freedesktop.fwupd
-ExecStart=@servicedir@/fwupd/fwupd
+ExecStart=@libexec@/fwupd
 MemoryDenyWriteExecute=yes
 PrivateTmp=yes
 ProtectControlGroups=yes
diff --git a/data/org.freedesktop.fwupd.service.in b/data/org.freedesktop.fwupd.service.in
index cde1e1d5b..74b94fb2f 100644
--- a/data/org.freedesktop.fwupd.service.in
+++ b/data/org.freedesktop.fwupd.service.in
@@ -1,6 +1,6 @@
 [D-BUS Service]
 Name=org.freedesktop.fwupd
 Documentation=http://www.fwupd.org/
-Exec=@servicedir@/fwupd/fwupd
+Exec=@libexecdir@/fwupd
 User=root
 SystemdService=fwupd.service