--- a/pgcluu_collectd.service
+++ b/pgcluu_collectd.service
@@ -1,14 +1,10 @@
 # Start script to run pgcluu_collectd as daemon
-# 
-# Feel free to modify the name of the PostgreSQL service and the path to following
-# your installation.
-#
 
 [Unit]
 Description=Postgresql performance and auditing statistics collecting
 Documentation=man:pgcluu(1)
-After=postgresql-9.x.service
-Wants=postgresql-9.x.service
+After=postgresql.service
+Wants=postgresql.service
 
 
 [Service]
@@ -16,15 +12,15 @@ Type=forking
 PermissionsStartOnly=true
 User=postgres
 Environment=STATDIR=/var/lib/pgcluu/data
-Environment=PIDFILE=/var/run/postgresql/pgcluu_collectd.pid
+Environment=PIDFILE=/run/postgresql/pgcluu_collectd.pid
 ExecStartPre=-/bin/mkdir -p $STATDIR
 ExecStartPre=-/bin/chown postgres: $STATDIR
-ExecStart=/usr/local/bin/pgcluu_collectd --daemonize --rotate-daily --pid-file $PIDFILE $STATDIR
-ExecStop=/usr/local/bin/pgcluu_collectd -k --pid-file $PIDFILE
+ExecStart=/usr/bin/pgcluu_collectd --daemonize --rotate-daily --pid-file $PIDFILE $STATDIR
+ExecStop=/usr/bin/pgcluu_collectd -k --pid-file $PIDFILE
 KillMode=process
 Restart=on-failure
 RestartSec=60s
-PIDFile=/var/run/postgresql/pgcluu_collectd.pid
+PIDFile=/run/postgresql/pgcluu_collectd.pid
 
 [Install]
 WantedBy=multi-user.target
--- a/pgcluu.service
+++ b/pgcluu.service
@@ -18,7 +18,7 @@ Environment=STATDIR=/var/lib/pgcluu/data
 Environment=REPORTDIR=/var/lib/pgcluu/report
 ExecStartPre=-/bin/mkdir -p $REPORTDIR
 ExecStartPre=-/bin/chown postgres: $REPORTDIR
-ExecStart=/usr/local/bin/pgcluu -o $REPORTDIR $STATDIR
+ExecStart=/usr/bin/pgcluu -o $REPORTDIR $STATDIR
 
 [Install]
 WantedBy=multi-user.target
