diff --git a/packages/sysutils/eventlircd/system.d/eventlircd.service b/packages/sysutils/eventlircd/system.d/eventlircd.service
index 7859753e2a..15b6078315 100644
--- a/packages/sysutils/eventlircd/system.d/eventlircd.service
+++ b/packages/sysutils/eventlircd/system.d/eventlircd.service
@@ -2,7 +2,7 @@
 Description=Eventlirc server daemon
 
 [Service]
-ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/run/lirc/lircd --release=_UP
+ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/run/lirc/lircd
 KillMode=process
 TimeoutStopSec=1s
 
diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk
index 89fa4a5ac5..68ea8d239e 100644
--- a/packages/sysutils/lirc/package.mk
+++ b/packages/sysutils/lirc/package.mk
@@ -37,6 +37,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_forkpty=no \
                            --with-gnu-ld \
                            --without-x"
 
+pre_configure_target() {
+  # patch lirc-make-devinput to use target kernel include
+  sed -e "s|/usr/include/linux/|${SYSROOT_PREFIX}/usr/include/linux/|g" \
+      -i ${ROOT}/${PKG_BUILD}/tools/lirc-make-devinput
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/lib/systemd
   rm -rf $INSTALL/lib
diff --git a/packages/sysutils/lirc/scripts/lircd_helper b/packages/sysutils/lirc/scripts/lircd_helper
index 6895403ca9..8e79b073a9 100755
--- a/packages/sysutils/lirc/scripts/lircd_helper
+++ b/packages/sysutils/lirc/scripts/lircd_helper
@@ -36,7 +36,7 @@ case "$ACTION" in
       LIRCD_CONFIG="--driver=$DRIVER --device=/dev/$DEVICE"
       LIRCD_CONFIG="$LIRCD_CONFIG --output=/run/lirc/lircd-$DEVICE"
       LIRCD_CONFIG="$LIRCD_CONFIG --pidfile=/run/lirc/lircd-$DEVICE.pid"
-      LIRCD_CONFIG="$LIRCD_CONFIG --release=_UP"
+      LIRCD_CONFIG="$LIRCD_CONFIG --release=_LIRCUP"
 
       if [ -e "/storage/.config/lircd.conf" ]; then
         LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/lircd.conf"
diff --git a/packages/sysutils/lirc/system.d/lircd-uinput@.service b/packages/sysutils/lirc/system.d/lircd-uinput@.service
index 0490aa5956..85ddf3e3bb 100644
--- a/packages/sysutils/lirc/system.d/lircd-uinput@.service
+++ b/packages/sysutils/lirc/system.d/lircd-uinput@.service
@@ -4,7 +4,7 @@ Description=lircd-uinput with %I
 ConditionPathExists=/storage/.cache/services/lircd.conf
 
 [Service]
-ExecStart=/usr/sbin/lircd-uinput /run/lirc/lircd-%I
+ExecStart=/usr/sbin/lircd-uinput --release=_LIRCUP /run/lirc/lircd-%I
 Slice=system-lircd.slice
 Restart=on-failure
 RestartSec=2