diff --git a/README.md b/README.md
index 69f70d87b..949385be4 100644
--- a/README.md
+++ b/README.md
@@ -685,7 +685,7 @@ A typical command line (enabling both UDP and NG protocols) thus may look like:
 
 	/usr/sbin/rtpengine --table=0 --interface=10.64.73.31 --interface=2001:db8::4f3:3d \
 	--listen-udp=127.0.0.1:22222 --listen-ng=127.0.0.1:2223 --tos=184 \
-	--pidfile=/var/run/rtpengine.pid
+	--pidfile=/run/rtpengine.pid
 
 
 Interfaces configuration
@@ -926,7 +926,7 @@ A typical start-up sequence including in-kernel forwarding might look like this:
 
 	# start daemon
 	/usr/sbin/rtpengine --table=0 --interface=10.64.73.31 --interface=2001:db8::4f3:3d \
-	--listen-ng=127.0.0.1:2223 --tos=184 --pidfile=/var/run/rtpengine.pid --no-fallback
+	--listen-ng=127.0.0.1:2223 --tos=184 --pidfile=/run/rtpengine.pid --no-fallback
 
 Running Multiple Instances
 --------------------------
@@ -948,9 +948,9 @@ then the start-up sequence might look like this:
 	echo 'del 1' > /proc/rtpengine/control
 
 	/usr/sbin/rtpengine --table=0 --interface=10.64.73.31 \
-	--listen-ng=127.0.0.1:2223 --tos=184 --pidfile=/var/run/rtpengine-10.pid --no-fallback
+	--listen-ng=127.0.0.1:2223 --tos=184 --pidfile=/run/rtpengine-10.pid --no-fallback
 	/usr/sbin/rtpengine --table=1 --interface=192.168.65.73 \
-	--listen-ng=127.0.0.1:2224 --tos=184 --pidfile=/var/run/rtpengine-192.pid --no-fallback
+	--listen-ng=127.0.0.1:2224 --tos=184 --pidfile=/run/rtpengine-192.pid --no-fallback
 
 With this setup, the SIP proxy can choose which instance of *rtpengine* to talk to and thus which local
 interface to use by sending its control messages to either port 2223 or port 2224.
diff --git a/debian/ngcp-rtpengine-daemon.default b/debian/ngcp-rtpengine-daemon.default
index 71412715f..ec896ffae 100644
--- a/debian/ngcp-rtpengine-daemon.default
+++ b/debian/ngcp-rtpengine-daemon.default
@@ -1,7 +1,7 @@
 RUN_RTPENGINE=no
 CONFIG_FILE=/etc/rtpengine/rtpengine.conf
 # CONFIG_SECTION=rtpengine
-PIDFILE=/var/run/ngcp-rtpengine-daemon.pid
+PIDFILE=/run/ngcp-rtpengine-daemon.pid
 MANAGE_IPTABLES=yes
 TABLE=0
 #SET_USER=root
diff --git a/debian/ngcp-rtpengine-daemon.init b/debian/ngcp-rtpengine-daemon.init
index dad43edd3..413f378a1 100755
--- a/debian/ngcp-rtpengine-daemon.init
+++ b/debian/ngcp-rtpengine-daemon.init
@@ -32,7 +32,7 @@ if [ "$RUN_RTPENGINE" != "yes" ]; then
 	log_action_msg "rtpengine not yet configured. Edit $DEFAULTS first."
 	exit 0
 fi
-[ -z "$PIDFILE" ] && PIDFILE="/var/run/rtpengine.pid"
+[ -z "$PIDFILE" ] && PIDFILE="/run/rtpengine.pid"
 
 OPTIONS=""
 START_OPTIONS=""
diff --git a/debian/ngcp-rtpengine-daemon.service b/debian/ngcp-rtpengine-daemon.service
index 9046376a4..b69385364 100644
--- a/debian/ngcp-rtpengine-daemon.service
+++ b/debian/ngcp-rtpengine-daemon.service
@@ -7,9 +7,9 @@ Requires=network-online.target
 [Service]
 Type=notify
 EnvironmentFile=/etc/default/ngcp-rtpengine-daemon
-PIDFile=/var/run/ngcp-rtpengine-daemon.pid
+PIDFile=/run/ngcp-rtpengine-daemon.pid
 ExecStartPre=/usr/sbin/ngcp-rtpengine-iptables-setup start
-ExecStart=/usr/sbin/rtpengine -f -E --pidfile /var/run/ngcp-rtpengine-daemon.pid --config-file /etc/rtpengine/rtpengine.conf --table $TABLE
+ExecStart=/usr/sbin/rtpengine -f -E --pidfile /run/ngcp-rtpengine-daemon.pid --config-file /etc/rtpengine/rtpengine.conf --table $TABLE
 ExecStopPost=/usr/sbin/ngcp-rtpengine-iptables-setup stop
 
 [Install]
diff --git a/debian/ngcp-rtpengine-recording-daemon.default b/debian/ngcp-rtpengine-recording-daemon.default
index 680e63c02..d6fc15867 100644
--- a/debian/ngcp-rtpengine-recording-daemon.default
+++ b/debian/ngcp-rtpengine-recording-daemon.default
@@ -1,7 +1,7 @@
 RUN_RTPENGINE_RECORDING=no
 CONFIG_FILE=/etc/rtpengine/rtpengine-recording.conf
 # CONFIG_SECTION=rtpengine-recording
-PIDFILE=/var/run/ngcp-rtpengine-recording-daemon.pid
+PIDFILE=/run/ngcp-rtpengine-recording-daemon.pid
 #SET_USER=root
 #SET_GROUP=root # GROUP only needs to be set if USER is not set or if the user isn't in the group
 #
diff --git a/debian/ngcp-rtpengine-recording-daemon.init b/debian/ngcp-rtpengine-recording-daemon.init
index 3bed33f8e..79fdc603b 100755
--- a/debian/ngcp-rtpengine-recording-daemon.init
+++ b/debian/ngcp-rtpengine-recording-daemon.init
@@ -31,7 +31,7 @@ if [ "$RUN_RTPENGINE_RECORDING" != "yes" ]; then
 	log_action_msg "rtpengine-recording not yet configured. Edit $DEFAULTS first."
 	exit 0
 fi
-[ -z "$PIDFILE" ] && PIDFILE="/var/run/rtpengine-recording.pid"
+[ -z "$PIDFILE" ] && PIDFILE="/run/rtpengine-recording.pid"
 
 OPTIONS=""
 START_OPTIONS=""
diff --git a/etc/rtpengine.sample.conf b/etc/rtpengine.sample.conf
index 0d9dd07c2..1ec88983e 100644
--- a/etc/rtpengine.sample.conf
+++ b/etc/rtpengine.sample.conf
@@ -26,7 +26,7 @@ tos = 184
 # final-timeout = 10800
 
 # foreground = false
-# pidfile = /var/run/ngcp-rtpengine-daemon.pid
+# pidfile = /run/ngcp-rtpengine-daemon.pid
 # num-threads = 16
 
 port-min = 30000