diff -Nrup a/Makefile.obexd b/Makefile.obexd
--- a/Makefile.obexd	2019-10-31 08:12:55.000000000 +0100
+++ b/Makefile.obexd	2019-11-20 07:55:01.077212484 +0100
@@ -1,12 +1,12 @@
 if SYSTEMD
 systemduserunitdir = $(SYSTEMD_USERUNITDIR)
 systemduserunit_DATA = obexd/src/obex.service
+endif
 
 dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
 dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
 
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
 
 if OBEX
 
diff -Nrup a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
--- a/obexd/src/org.bluez.obex.service.in	1970-01-01 01:00:00.000000000 +0100
+++ b/obexd/src/org.bluez.obex.service.in	2019-11-20 07:53:52.835653954 +0100
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@pkglibexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service