diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c

index 1618fde94..a236dab69 100644

--- a/plugins/imuxsock/imuxsock.c

+++ b/plugins/imuxsock/imuxsock.c

@@ -75,7 +75,7 @@ MODULE_CNFNAME("imuxsock")

 /* defines */

 #ifndef _PATH_LOG

 #ifdef BSD

-#define _PATH_LOG	"/var/run/log"

+#define _PATH_LOG	"/run/log"

 #else

 #define _PATH_LOG	"/dev/log"

 #endif

diff --git a/tools/omfwd.c b/tools/omfwd.c

index e063f2e6b..62027efa3 100644

--- a/tools/omfwd.c

+++ b/tools/omfwd.c

@@ -798,7 +798,7 @@ static rsRetVal changeToNs(instanceData *const pData __attribute__((unused)))

 		}

 		/* build network namespace path */

-		if (asprintf(&nsPath, "/var/run/netns/%s", pData->networkNamespace) == -1) {

+		if (asprintf(&nsPath, "/run/netns/%s", pData->networkNamespace) == -1) {

 			LogError(0, RS_RET_OUT_OF_MEMORY, "omfwd: asprintf failed");

 			ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);

 		}

diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8

index 2b320f859..788564d71 100644

--- a/tools/rsyslogd.8

+++ b/tools/rsyslogd.8

@@ -128,14 +128,14 @@ reacts to a set of signals.  You may easily send a signal to

 using the following:

 .IP

 .nf

-kill -SIGNAL $(cat /var/run/rsyslogd.pid)

+kill -SIGNAL $(cat /run/rsyslogd.pid)

 .fi

 .PP

 Note that -SIGNAL must be replaced with the actual signal

 you are trying to send, e.g. with HUP. So it then becomes:

 .IP

 .nf

-kill -HUP $(cat /var/run/rsyslogd.pid)

+kill -HUP $(cat /run/rsyslogd.pid)

 .fi

 .PP

 .TP

@@ -216,7 +216,7 @@ for exact information.

 .I /dev/log

 The Unix domain socket to from where local syslog messages are read.

 .TP

-.I /var/run/rsyslogd.pid

+.I /run/rsyslogd.pid

 The file containing the process id of 

 .BR rsyslogd .

 .TP

diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c

index fe5dff890..788fa1839 100644

--- a/tools/rsyslogd.c

+++ b/tools/rsyslogd.c

@@ -155,7 +155,7 @@ void rsyslogdDoDie(int sig);

 #if defined(_AIX)  /* AIXPORT : Add _AIX */

 #	define PATH_PIDFILE "/etc/rsyslogd.pid"

 #else

-#	define PATH_PIDFILE "/var/run/rsyslogd.pid"

+#	define PATH_PIDFILE "/run/rsyslogd.pid"

 #endif /*_AIX*/

 #endif

Patch1: replaced-rundir-8.39.0.patch

%patch1 -p1