diff --git a/Makefile.am b/Makefile.am
index fb103a6..62ca7cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,6 @@ noinst_LTLIBRARIES =
 
 bin_PROGRAMS =
 
-libexec_PROGRAMS =
-
 noinst_PROGRAMS =
 
 dist_man_MANS =
@@ -21,6 +19,10 @@ CLEANFILES =
 
 EXTRA_DIST =
 
+libexecdir = @libexecdir@/bluetooth
+
+libexec_PROGRAMS =
+
 includedir = @includedir@/bluetooth
 
 include_HEADERS =
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index 2b73254..34972e1 100644
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -5,7 +5,7 @@ Documentation=man:bluetoothd(8)
 [Service]
 Type=dbus
 BusName=org.bluez
-ExecStart=@libexecdir@/bluetoothd
+ExecStart=@libexecdir@/bluetooth/bluetoothd
 NotifyAccess=main
 #WatchdogSec=10
 #Restart=on-failure