diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index a394a8e9e0..69c8e8a475 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -108,7 +108,6 @@ post_makeinstall_target() {
 
   # copy openelec helper scripts
     mkdir -p $INSTALL/lib/systemd/
-      cp $PKG_DIR/scripts/openelec-debugconfig $INSTALL/lib/systemd/
       cp $PKG_DIR/scripts/openelec-userconfig $INSTALL/lib/systemd/
 
   # provide 'halt', 'shutdown', 'reboot' & co.
diff --git a/packages/sysutils/systemd/scripts/openelec-debugconfig b/packages/sysutils/systemd/scripts/openelec-debugconfig
deleted file mode 100755
index a46737aa47..0000000000
--- a/packages/sysutils/systemd/scripts/openelec-debugconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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
-################################################################################
-
-mkdir -p /run/openelec
-
-cat > /run/openelec/debug.conf <<EOF
-AVAHI_DEBUG="--debug"
-BLUEZ_DEBUG="--debug"
-OBEX_DEBUG="--debug"
-XORG_DEBUG="-logverbose 6 -verbose 6"
-EOF
\ No newline at end of file
diff --git a/packages/sysutils/systemd/system.d/debugconfig.service b/packages/sysutils/systemd/system.d/debugconfig.service
index f8c132bd4c..10e945569f 100644
--- a/packages/sysutils/systemd/system.d/debugconfig.service
+++ b/packages/sysutils/systemd/system.d/debugconfig.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=Setup debug config
 DefaultDependencies=no
-After=local-fs.target
+After=local-fs.target systemd-tmpfiles-setup.service
 
 ConditionKernelCommandLine=debugging
 
 [Service]
 Type=oneshot
-ExecStart=/lib/systemd/openelec-debugconfig
+ExecStart=/bin/sh -c 'cp /usr/share/debugconf/*.conf /run/openelec/debug'
 
 [Install]
 WantedBy=sysinit.target
diff --git a/packages/sysutils/systemd/tmpfiles.d/openelec.conf b/packages/sysutils/systemd/tmpfiles.d/openelec.conf
index 583e041c5b..8e06b38a39 100644
--- a/packages/sysutils/systemd/tmpfiles.d/openelec.conf
+++ b/packages/sysutils/systemd/tmpfiles.d/openelec.conf
@@ -18,4 +18,5 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-d    /run/openelec   0755 root root - -
\ No newline at end of file
+d    /run/openelec       0755 root root - -
+d    /run/openelec/debug 0755 root root - -
\ No newline at end of file