--- a/rpm/tvheadend.service	2015-10-22 21:13:23.000000000 +0200
+++ b/rpm/tvheadend.service	2015-12-06 12:12:50.803031083 +0100
@@ -1,11 +1,11 @@
 [Unit]
 Description=Tvheadend - a TV streaming server and DVR
-After=syslog.target network.target auditd.service
+After=network.target auditd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/tvheadend
-ExecStart=/usr/bin/tvheadend -f -p /var/run/tvheadend.pid $OPTIONS
-PIDFile=/var/run/tvheadend.pid
+ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid $OPTIONS
+PIDFile=/run/tvheadend.pid
 Type=forking
 Restart=on-failure
 RestartSec=54s
--- a/rpm/tvheadend.sysconfig	2015-10-22 21:13:23.000000000 +0200
+++ b/rpm/tvheadend.sysconfig	2015-12-06 12:12:43.323348301 +0100
@@ -1,3 +1,3 @@
 # Configuration file for the tvheadend service.
 
-OPTIONS="-c /home/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981 --htsp_port 9982"
+OPTIONS="-c /home/tvheadend/config -u hts -g video -6 --http_port 9981 --htsp_port 9982"