diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
deleted file mode 100644
index 48a2a9515f..0000000000
--- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
+++ /dev/null
@@ -1,60 +0,0 @@
-################################################################################
-# An example udev rules file for lircd.
-################################################################################
-
-# lircd_helper only does something for "add" and "remove" actions.
-ACTION!="add|remove", GOTO="end"
-
-KERNEL=="hiddev[0-9]*", SUBSYSTEM=="usb",  SUBSYSTEMS=="usb", GOTO="begin"
-KERNEL=="ttyACM[0-9]*", SUBSYSTEM=="tty",  SUBSYSTEMS=="usb", GOTO="begin"
-KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="i2c", GOTO="begin"
-KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="usb", GOTO="begin"
-KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="platform", GOTO="begin"
-KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="pnp", GOTO="begin"
-GOTO="end"
-LABEL="begin"
-
-#-------------------------------------------------------------------------------
-# Ask lircd_helper to lirc devices.
-#-------------------------------------------------------------------------------
-SUBSYSTEM=="lirc", \
-  ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf"
-
-### Microsoft Xbox DVD dongle
-SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \
-  ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
-
-### RPi GPIO IR Receiver
-SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
-  ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf.rpi"
-
-#-------------------------------------------------------------------------------
-# Ask lircd_helper to handle USB devices that do not show up as lirc devices
-# and are supported by lircd. Remote controls that are USB HID devices that show
-# up as event devices are not included as as they are handled by eventlircd.
-#-------------------------------------------------------------------------------
-SUBSYSTEMS=="usb", GOTO="begin-usb"
-GOTO="end-usb"
-LABEL="begin-usb"
-
-ENV{ID_USB_INTERFACES}=="", IMPORT{builtin}="usb_id"
-
-ENV{ID_VENDOR_ID}=="04d8", ENV{ID_MODEL_ID}=="fd08", \
-  ENV{lircd_driver}="usb_irtoy", \
-  ENV{lircd_conf}="/storage/.config/lircd.conf"
-
-ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \
-  ENV{lircd_driver}="dvico", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf"
-
-# Enable wake-on-usb for the USB remotes.
-ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="wakeup_enable"
-
-LABEL="end-usb"
-
-ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="lircd_helper"
-
-LABEL="end"
diff --git a/packages/sysutils/remote/lirc/package.mk b/packages/sysutils/remote/lirc/package.mk
index c699edd707..0042ba776c 100644
--- a/packages/sysutils/remote/lirc/package.mk
+++ b/packages/sysutils/remote/lirc/package.mk
@@ -58,7 +58,9 @@ post_makeinstall_target() {
     cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc
     cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc
 
+  mkdir -p $INSTALL/usr/lib/openelec
+    cp $PKG_DIR/scripts/lircd_helper $INSTALL/usr/lib/openelec
+
   mkdir -p $INSTALL/usr/lib/udev
-    cp $PKG_DIR/scripts/lircd_helper $INSTALL/usr/lib/udev
     cp $PKG_DIR/scripts/lircd_wakeup_enable $INSTALL/usr/lib/udev
 }
diff --git a/packages/sysutils/remote/lirc/scripts/lircd_helper b/packages/sysutils/remote/lirc/scripts/lircd_helper
index 4e331b0d25..95341a8b18 100755
--- a/packages/sysutils/remote/lirc/scripts/lircd_helper
+++ b/packages/sysutils/remote/lirc/scripts/lircd_helper
@@ -1,74 +1,66 @@
 #!/bin/sh
 ################################################################################
-# lircd_helper
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
-# This script can be used by udev to start or stop lircd when a remote control
-# device is added or removed.
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
 #
-# lircd_helper configures lircd to output using a uinput event device so that
-# eventlircd can aggregate the outputs into a single lircd socket.
+#  OpenELEC 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.
 #
-# lircd_helper configures lircd to use an lircd socket name that is derived
-# from the device name. In addition, lircd_helper creates symbolic links to this
-# lircd socket that are derived from the device symbolic links. You can use this
-# socket and the symbolic link to this socket when using commands such as
-# irsend.
-#
-# lircd_helper understands two lircd_helper specific device properites set
-# using ENV{} and passed as environment variables:
-#   lircd_driver:
-#     Used to tell lircd_helper the name of the lircd driver.
-#   lircd_conf:
-#     Used to tell lircd_helper the path to the lircd.conf file to use.
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-case "${ACTION}" in
-    add)
-        if test "x${lircd_driver}" = "x" ; then
-            exit 1;
-        fi
-        if test "x${lircd_conf}" = "x" ; then
-            exit 1;
-        fi
-        if test ! -e '/run/lirc' ; then
-            mkdir -p '/run/lirc'
-        fi
-        devname_instance=`echo ${DEVNAME} | sed -e 's/\/\+/~/g' -e 's/^~dev~//'`
-        if test ! -e "/run/lirc/lircd-${devname_instance}.pid" ; then
-            daemon='/usr/sbin/lircd'
-            daemon="${daemon} --driver=${lircd_driver}"
-            daemon="${daemon} --device=${DEVNAME}"
-            daemon="${daemon} --uinput"
-            daemon="${daemon} --output=/run/lirc/lircd-${devname_instance}"
-            daemon="${daemon} --pidfile=/run/lirc/lircd-${devname_instance}.pid"
-            if test -e "/storage/.config/lircd.conf" ; then
-                daemon="${daemon} /storage/.config/lircd.conf"
-            elif test -e "${lircd_conf}" ; then
-                daemon="${daemon} ${lircd_conf}"
-            else
-                exit 1
-            fi
-            ${daemon}
-            for devlink in ${DEVLINKS} ; do
-                devlink_instance=`echo ${devlink} | /bin/sed -e 's/\/\+/~/g' -e 's/^~dev~//'`
-                rm -f "/run/lirc/lircd-${devlink_instance}"
-                ln -s "lircd-${devname_instance}" "/run/lirc/lircd-${devlink_instance}"
-            done
-        fi
-        ;;
-    remove)
-        instance=`echo $DEVNAME | sed -e 's/\/\+/~/g' -e 's/^~dev~//'`
-        if test -e "/run/lirc/lircd-${instance}.pid" ; then
-            pid=`cat /run/lirc/lircd-${instance}.pid`
-            if test ! "x${pid}" = "x" ; then
-                kill ${pid}
-            fi
-            for devlink in ${DEVLINKS} ; do
-                devlink_instance=`echo ${devlink} | sed -e 's/\/\+/~/g' -e 's/^~dev~//'`
-                rm -f "/run/lirc/lircd-${devlink_instance}"
-            done
-        fi
-        ;;
+ACTION=$(echo "$1")
+DEVICE=$(echo "$2" | cut -f1 -d:)
+DRIVER=$(echo "$2" | cut -f2 -d:)
+CONFIG=$(echo "$2" | cut -f3 -d:)
+
+case "$ACTION" in
+  add)
+    if [ "x$DRIVER" = "x" ]; then
+      exit 1;
+    fi
+    if [ "x$CONFIG" = "x" ]; then
+      exit 1;
+    fi
+
+    mkdir -p '/run/lirc'
+
+    if [ ! -e "/run/lirc/lircd-$DEVICE.pid" ]; then
+
+      LIRCD="/usr/sbin/lircd"
+      LIRCD_CONFIG="--uinput --driver=$DRIVER --device=/dev/$DEVICE"
+      LIRCD_CONFIG="$LIRCD_CONFIG --output=/run/lirc/lircd-$DEVICE"
+      LIRCD_CONFIG="$LIRCD_CONFIG --pidfile=/run/lirc/lircd-$DEVICE.pid"
+
+      if [ -e "/storage/.config/$CONFIG" ]; then
+        LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/$CONFIG"
+      elif [ -e "/storage/.config/lircd.conf" ]; then
+        LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/lircd.conf"
+      elif [ -e "/etc/lirc/$CONFIG" ]; then
+        LIRCD_CONFIG="$LIRCD_CONFIG /etc/lirc/$CONFIG"
+      else
+        exit 1
+      fi
+
+      exec $LIRCD $LIRCD_CONFIG
+    fi
+    ;;
+  remove)
+    if [ -e "/run/lirc/lircd-$DEVICE.pid" ]; then
+      PID=`cat /run/lirc/lircd-$DEVICE.pid`
+      if [ ! "x$PID" = "x" ]; then
+        kill $PID
+      fi
+    fi
+    ;;
 esac
 
 exit 0
diff --git a/packages/sysutils/remote/lirc/system.d/lircd@.service b/packages/sysutils/remote/lirc/system.d/lircd@.service
new file mode 100644
index 0000000000..ff293c7bff
--- /dev/null
+++ b/packages/sysutils/remote/lirc/system.d/lircd@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lirc with %I
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/openelec/lircd_helper add %I
+ExecStop=/usr/lib/openelec/lircd_helper remove %I
+TimeoutStopSec=1
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packages/sysutils/remote/lirc/udev.d/98-lircd.rules b/packages/sysutils/remote/lirc/udev.d/98-lircd.rules
index 30654b408b..5a39bcf1b3 100644
--- a/packages/sysutils/remote/lirc/udev.d/98-lircd.rules
+++ b/packages/sysutils/remote/lirc/udev.d/98-lircd.rules
@@ -17,19 +17,20 @@ LABEL="begin"
 #-------------------------------------------------------------------------------
 # Ask lircd_helper to lirc devices.
 #-------------------------------------------------------------------------------
-SUBSYSTEM=="lirc", \
-  ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf"
+
+#SUBSYSTEM=="lirc", \
+#  ENV{lircd_driver}="default", \
+#  ENV{lircd_conf}="lircd.conf"
 
 ### Microsoft Xbox DVD dongle
 SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \
   ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
+  ENV{lircd_conf}="lircd.conf.xbox"
 
 ### RPi GPIO IR Receiver
 SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
   ENV{lircd_driver}="default", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf.rpi"
+  ENV{lircd_conf}="lircd.conf.rpi"
 
 #-------------------------------------------------------------------------------
 # Ask lircd_helper to handle USB devices that do not show up as lirc devices
@@ -38,23 +39,23 @@ SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
 #-------------------------------------------------------------------------------
 SUBSYSTEMS=="usb", GOTO="begin-usb"
 GOTO="end-usb"
+
 LABEL="begin-usb"
 
 ENV{ID_USB_INTERFACES}=="", IMPORT{builtin}="usb_id"
 
 ENV{ID_VENDOR_ID}=="04d8", ENV{ID_MODEL_ID}=="fd08", \
   ENV{lircd_driver}="usb_irtoy", \
-  ENV{lircd_conf}="/storage/.config/lircd.conf"
+  ENV{lircd_conf}="lircd.conf"
 
 ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \
   ENV{lircd_driver}="dvico", \
-  ENV{lircd_conf}="/etc/lirc/lircd.conf"
-
-# Enable wake-on-usb for the USB remotes.
-ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="lircd_wakeup_enable"
+  ENV{lircd_conf}="lircd.conf"
 
 LABEL="end-usb"
 
-ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="lircd_helper"
+ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="lircd@$name:$env{lircd_driver}:$env{lircd_conf}.service", RUN+="lircd_wakeup_enable"
+# ACTION=="add", RUN+="/usr/bin/systemctl start lircd@$name:$env{lircd_driver}:$env{lircd_conf}.service", RUN+="lircd_wakeup_enable"
+ACTION=="remove", RUN+="/usr/bin/systemctl stop lircd@$name:$env{lircd_driver}:$env{lircd_conf}.service"
 
 LABEL="end"