tumblerd/Makefile.am                              | 6 +++---
 tumblerd/org.xfce.Tumbler.Cache1.service.in       | 2 +-
 tumblerd/org.xfce.Tumbler.Manager1.service.in     | 2 +-
 tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in | 2 +-
 tumblerd/tumblerd.service.in                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index 4836bf6..a3d6c9a 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -18,7 +18,7 @@
 # Boston, MA 02110-1301, USA.
 
 tumblerddir =								\
-	$(libdir)/tumbler-$(TUMBLER_VERSION_API)
+	$(libexecdir)/tumbler-$(TUMBLER_VERSION_API)
 
 tumblerd_PROGRAMS =							\
 	tumblerd
@@ -107,13 +107,13 @@ dbus_xml_in_files = \
 dbus_xml_files = $(dbus_xml_in_files:.xml.in=.xml)
 
 @TUMBLER_SERVICE_FILENAME_PREFIX@.%.service: org.xfce.Tumbler.%.service.in
-	$(SED) -e "s,\@libdir\@,$(libdir),g" \
+	$(SED) -e "s,\@libexecdir\@,$(libexecdir),g" \
 	       -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" \
 	       -e "s,\@TUMBLER_SERVICE_NAME_PREFIX\@,$(TUMBLER_SERVICE_NAME_PREFIX),g" \
 	       -e "s,\@TUMBLER_SERVICE_PATH_PREFIX\@,$(TUMBLER_SERVICE_PATH_PREFIX),g" < $< > $@
 
 tumblerd.service: tumblerd.service.in
-	$(SED) -e "s,\@libdir\@,$(libdir),g" \
+	$(SED) -e "s,\@libexecdir\@,$(libexecdir),g" \
 	       -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" \
 	       -e "s,\@TUMBLER_SERVICE_NAME_PREFIX\@,$(TUMBLER_SERVICE_NAME_PREFIX),g" \
 	       -e "s,\@TUMBLER_SERVICE_PATH_PREFIX\@,$(TUMBLER_SERVICE_PATH_PREFIX),g" < $< > $@
diff --git a/tumblerd/org.xfce.Tumbler.Cache1.service.in b/tumblerd/org.xfce.Tumbler.Cache1.service.in
index 6e806bf..7724789 100644
--- a/tumblerd/org.xfce.Tumbler.Cache1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Cache1.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=@TUMBLER_SERVICE_NAME_PREFIX@.Cache1
-Exec=@libdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
+Exec=@libexecdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
 SystemdService=tumblerd.service
diff --git a/tumblerd/org.xfce.Tumbler.Manager1.service.in b/tumblerd/org.xfce.Tumbler.Manager1.service.in
index c427264..82fc076 100644
--- a/tumblerd/org.xfce.Tumbler.Manager1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Manager1.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=@TUMBLER_SERVICE_NAME_PREFIX@.Manager1
-Exec=@libdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
+Exec=@libexecdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
 SystemdService=tumblerd.service
diff --git a/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
index 7740723..827b424 100644
--- a/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=@TUMBLER_SERVICE_NAME_PREFIX@.Thumbnailer1
-Exec=@libdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
+Exec=@libexecdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
 SystemdService=tumblerd.service
diff --git a/tumblerd/tumblerd.service.in b/tumblerd/tumblerd.service.in
index cf26eae..c0868c7 100644
--- a/tumblerd/tumblerd.service.in
+++ b/tumblerd/tumblerd.service.in
@@ -6,4 +6,4 @@ Type=dbus
 # This is deliberately the bus name that is the last one to be claimed;
 # if this is claimed, then everything is ready
 BusName=@TUMBLER_SERVICE_NAME_PREFIX@.Thumbnailer1
-ExecStart=@libdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd
+ExecStart=@libexecdir@/tumbler-@TUMBLER_VERSION_API@/tumblerd