diff --git a/utils/systemd/monerod.service b/utils/systemd/monerod.service
index 182878eb..12395eb8 100644
--- a/utils/systemd/monerod.service
+++ b/utils/systemd/monerod.service
@@ -8,15 +8,10 @@ Group=monero
 WorkingDirectory=~
 
 Type=forking
-ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf --detach
+PIDFile=/var/run/monerod.pid
 
-# This is necessary because monerod does not yet support
-# writing a PID file, which means systemd tries to guess the PID
-# by default, but it guesses wrong (sometimes, depending on
-# random timing of events), because the daemon forks twice.
-# The ultimate fix is for the daemon to write a PID file, and
-# a workaround is to disable the guessing feature in systemd.
-GuessMainPID=no
+ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf \
+    --detach --pidfile /var/run/monerod.pid
 
 [Install]
 WantedBy=multi-user.target