diff --git a/spamassassin.service b/spamassassin.service
index 4f80e49..6bce278 100644
--- a/spamassassin.service
+++ b/spamassassin.service
@@ -1,13 +1,15 @@
 [Unit]
 Description=Spamassassin daemon
+After=syslog.target network.target
 
 [Service]
-EnvironmentFile=/etc/sysconfig/spamassassin
+Type=forking
+PIDFile=/var/run/spamd.pid
+EnvironmentFile=-/etc/sysconfig/spamassassin
 ExecStartPre=-/sbin/portrelease spamd
-ExecStart=/usr/bin/spamd ${SPAMDOPTIONS}
-Restart=always
+ExecStart=/usr/bin/spamd $SPAMDOPTIONS
 StandardOutput=syslog
+StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
-