diff --git a/packages/network/bluez/init.d/54_bluez b/packages/network/bluez/init.d/54_bluez
deleted file mode 100644
index b3887cb6b9..0000000000
--- a/packages/network/bluez/init.d/54_bluez
+++ /dev/null
@@ -1,45 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-#
-# start bluetooth daemon
-#
-# runlevels: openelec, textmode
-
-(
-  # can be called from openelec addon.
-  # ensure that environment is sane
-  . /etc/profile
-
-  if [ "$DEBUG" = "yes" ]; then
-    BLUEZ_DEBUG="-d"
-  fi
-
-  BLUEZ_ENABLED=true
-  if [ -f $CONFIG_CACHE/service_bluez.conf ]; then
-    . $CONFIG_CACHE/service_bluez.conf
-  fi
-
-  if [ "$BLUEZ_ENABLED" == "true" ]; then
-    progress "Starting bluetooth daemon"
-    wait_for_dbus
-    /usr/lib/bluetooth/bluetoothd $BLUEZ_DEBUG &>/dev/null
-  fi
-)&
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index ee94378618..44f417d4bd 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -57,7 +57,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                            --disable-cups \
                            --disable-obex \
                            --enable-client \
-                           --disable-systemd \
+                           --enable-systemd \
                            --enable-datafiles \
                            --disable-experimental \
                            --with-gnu-ld \
@@ -71,6 +71,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/dbus-1/services
-    cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/services
+  enable_service bluetooth.service
 }
diff --git a/packages/network/bluez/tmpfiles.d/81_bluez.conf b/packages/network/bluez/tmpfiles.d/bluez.conf
similarity index 100%
rename from packages/network/bluez/tmpfiles.d/81_bluez.conf
rename to packages/network/bluez/tmpfiles.d/bluez.conf