diff --git a/packages/network/bluez/system.d/obex-monitor.path b/packages/network/bluez/system.d/obex-monitor.path
index ad25368960..7bebb47f41 100644
--- a/packages/network/bluez/system.d/obex-monitor.path
+++ b/packages/network/bluez/system.d/obex-monitor.path
@@ -2,7 +2,7 @@
 Description=OBEX configfile monitor
 
 [Path]
-PathModified=/storage/.cache/services/obex.conf
+PathModified=/storage/.cache/services/obexd.conf
 PathModified=/run/openelec/debug.conf
 
 [Install]
diff --git a/packages/network/bluez/system.d/obex.service b/packages/network/bluez/system.d/obex.service
index db2198bd1a..5b18d3bbed 100644
--- a/packages/network/bluez/system.d/obex.service
+++ b/packages/network/bluez/system.d/obex.service
@@ -3,13 +3,14 @@ Description=Bluetooth service
 Requires=bluetooth.target bluetooth.service
 After=bluetooth.service
 
-ConditionPathExists=/storage/.cache/services/obex.conf
+ConditionPathExists=/storage/.cache/services/obexd.conf
 ConditionPathExists=/storage/.cache/services/bluez.conf
 
 [Service]
-EnvironmentFile=/storage/.cache/services/obex.conf
+EnvironmentFile=/storage/.cache/services/obexd.conf
 EnvironmentFile=-/run/openelec/debug.conf
-ExecStart=/usr/lib/bluetooth/obexd $OBEX_ARGS $OBEX_DEBUG
+ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT'
+ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG
 
 [Install]
 WantedBy=bluetooth.target