diff --git a/include/systemd/warewulfd.service b/include/systemd/warewulfd.service
index 54fc4458..992f3614 100644
--- a/include/systemd/warewulfd.service
+++ b/include/systemd/warewulfd.service
@@ -5,10 +5,12 @@ After=network-online.target
 AssertFileIsExecutable=/usr/bin/wwctl
 
 [Service]
+Type=forking
 User=root
 Group=warewulf
 
-ExecStart=/usr/bin/wwctl server start --foreground
+ExecStart=/usr/bin/wwctl server start
+PIDFile=/tmp/warewulfd.pid
 Restart=always
 
 [Install]