diff --git a/rrdcached-systemd-pre b/rrdcached-systemd-pre
index 46541b0..fbec76a 100644
--- a/rrdcached-systemd-pre
+++ b/rrdcached-systemd-pre
@@ -14,7 +14,7 @@ test -r $RRDCACHED_CONFIG || { echo "$RRDCACHED_CONFIG not existing";
         if [ "$1" = "stop" ]; then exit 0;
         else exit 6; fi; }
 
-RRDCACHED_PID='/var/lib/rrdtool/rrdcached/rrdcached.pid'
+RRDCACHED_PID='/run/rrdcached.pid'
 
 # Read config   
 . $RRDCACHED_CONFIG
diff --git a/rrdcached.service b/rrdcached.service
index fa947c6..02a3eba 100644
--- a/rrdcached.service
+++ b/rrdcached.service
@@ -19,7 +19,7 @@ EnvironmentFile=-/etc/sysconfig/rrdcached
 ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p "$RRDCACHED_PID" -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w $RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS $RRDCACHED_OPTIONS
 Restart=always
 RestartSec=1
-PIDFile="$RRDCACHED_PID"
+PIDFile=/run/rrdcached.pid
 TimeoutStopSec=10
 
 [Install]
diff --git a/rrdtool.changes b/rrdtool.changes
index 9656657..bd27e8e 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct  4 17:01:23 UTC 2013 - p.drouand@gmail.com
+
+- Remove PIDfile definition of sysconfig file and add it in systemd
+  service file
+- Fix PIDfile location to /run instead of var/lib/rccached
+
 -------------------------------------------------------------------
 Fri Oct  4 10:40:05 UTC 2013 - obs@botter.cc
 
diff --git a/sysconfig.rrdcached b/sysconfig.rrdcached
index 5974756..1d61ed9 100644
--- a/sysconfig.rrdcached
+++ b/sysconfig.rrdcached
@@ -103,12 +103,3 @@ RRDCACHED_CHROOT_DIR="/tmp"
 #
 RRDCACHED_OPTIONS=""
 
-## Type:           string
-## Default:        "/var/lib/rrdtool/rrdcached/rrdcached.pid"
-## Config:         rrdcached
-## ServiceRestart: rrdcached
-#
-# PID file location 
-#
-RRDCACHED_PID="/var/lib/rrdtool/rrdcached/rrdcached.pid"
-