diff --git a/bacula-dir.service b/bacula-dir.service
index 1dafbcf..ab34487 100644
--- a/bacula-dir.service
+++ b/bacula-dir.service
@@ -1,15 +1,13 @@
 [Unit]
 Description=Bacula-Director, the Backup-server
 Documentation=man:bacula-dir(8)
-Requires=syslog.target network.target nss-lookup.target
 After=network.target nss-lookup.target
 
 [Service]
 Environment=CONFIG=/etc/bacula/bacula-dir.conf
 EnvironmentFile=-/etc/sysconfig/bacula-dir
 ExecStart=/usr/sbin/bacula-dir -f $OPTS -c $CONFIG -u $DIR_USER -g $DIR_GROUP
-StandardOutput=syslog
-Restart=always
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/bacula-fd.service b/bacula-fd.service
index ab00ce1..043f06d 100644
--- a/bacula-fd.service
+++ b/bacula-fd.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Bacula-FileDaemon, a Backup-client
 Documentation=man:bacula-fd(8)
-Requires=syslog.target network.target nss-lookup.target
 After=network.target nss-lookup.target
 
 [Service]
@@ -9,8 +8,7 @@ Environment=CONFIG=/etc/bacula/bacula-fd.conf
 EnvironmentFile=-/etc/sysconfig/bacula-fd
 ExecStart=/usr/sbin/bacula-fd -f $OPTS -c $CONFIG -u $FD_USER -g $FD_GROUP
 IOSchedulingClass=idle
-StandardOutput=syslog
-Restart=always
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/bacula-sd.service b/bacula-sd.service
index 01fcabb..1f4ca64 100644
--- a/bacula-sd.service
+++ b/bacula-sd.service
@@ -1,15 +1,13 @@
 [Unit]
 Description=Bacula-StorageDaemon, the storage-server
 Documentation=man:bacula-sd(8)
-Requires=syslog.target network.target nss-lookup.target
 After=network.target nss-lookup.target
 
 [Service]
 Environment=CONFIG=/etc/bacula/bacula-sd.conf
 EnvironmentFile=-/etc/sysconfig/bacula-sd
 ExecStart=/usr/sbin/bacula-sd -f $OPTS -c $CONFIG -u $SD_USER -g $SD_GROUP
-StandardOutput=syslog
-Restart=always
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/bacula.spec b/bacula.spec
index a01f8db..575743a 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:                   bacula
 Version:                5.2.13
-Release:                8%{?dist}
+Release:                9%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -911,6 +911,9 @@ fi
 
 
 %changelog
+* Tue Apr 16 2013 Simone Caronni <negativo17@gmail.com> - 5.2.13-9
+- Systemd service files cleanup, thanks Michal Schmidt (#952334)
+
 * Mon Apr 08 2013 Petr Hracek <phracek@redhat.com> - 5.2.13-8
 - Correcting options and man pages (#948837)