diff --git a/.gitignore b/.gitignore
index ad85ff5..7be0fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ src/bluetooth.service
 
 obexd/src/builtin.h
 obexd/src/obexd
+obexd/src/obex.service
 tools/obex-client-tool
 tools/obex-server-tool
 unit/test-gobex
diff --git a/Makefile.obexd b/Makefile.obexd
index ba12039..ae05ae9 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,4 +1,14 @@
 
+if SYSTEMD
+systemduserunitdir = @SYSTEMD_USERUNITDIR@
+systemduserunit_DATA = obexd/src/obex.service
+
+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
+
 obex_plugindir = $(libdir)/obex/plugins
 
 obexd_builtin_modules =
@@ -92,6 +102,6 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
 obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
 
-CLEANFILES += obexd/src/builtin.h $(builtin_files)
+CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
 
 EXTRA_DIST += obexd/src/genbuiltin
diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
new file mode 100644
index 0000000..bca3aef
--- /dev/null
+++ b/obexd/src/obex.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bluetooth OBEX service
+
+[Service]
+Type=dbus
+BusName=org.bluez.obex
+ExecStart=@libexecdir@/obexd
+
+[Install]
+Alias=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
new file mode 100644
index 0000000..a538088
--- /dev/null
+++ b/obexd/src/org.bluez.obex.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=/bin/false
+SystemdService=dbus-org.bluez.obex.service