diff --git a/packages/mediacenter/xbmc/scripts/xbmc-config b/packages/mediacenter/xbmc/scripts/xbmc-config
index af8f2a042a..1ad05bf38e 100755
--- a/packages/mediacenter/xbmc/scripts/xbmc-config
+++ b/packages/mediacenter/xbmc/scripts/xbmc-config
@@ -17,10 +17,10 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-if [ -e /var/run/lirc/lircd.irtrans ]; then
-  XBMC_ARGS="--lircdev /var/run/lirc/lircd.irtrans"
+if [ -e /run/lirc/lircd.irtrans ]; then
+  XBMC_ARGS="--lircdev /run/lirc/lircd.irtrans"
 else
-  XBMC_ARGS="--lircdev /var/run/lirc/lircd"
+  XBMC_ARGS="--lircdev /run/lirc/lircd"
 fi
 
 echo "XBMC_ARGS=\"$XBMC_ARGS\"" > /run/openelec/xbmc.conf
diff --git a/packages/sysutils/remote/eventlircd/system.d/eventlircd.service b/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
index 100ca8852b..7859753e2a 100644
--- a/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
+++ b/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
@@ -2,7 +2,7 @@
 Description=Eventlirc server daemon
 
 [Service]
-ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
+ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/run/lirc/lircd --release=_UP
 KillMode=process
 TimeoutStopSec=1s
 
diff --git a/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf
index 905c203b9a..e9c344b64f 100644
--- a/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf
+++ b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf
@@ -16,4 +16,4 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /var/run/lirc     0755 root root - -
+d    /run/lirc     0755 root root - -
diff --git a/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf
index 905c203b9a..e9c344b64f 100644
--- a/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf
+++ b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf
@@ -16,4 +16,4 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /var/run/lirc     0755 root root - -
+d    /run/lirc     0755 root root - -