diff --git a/webmin-systemd b/webmin-systemd
index d7de6c4d6..dc91be820 100644
--- a/webmin-systemd
+++ b/webmin-systemd
@@ -4,15 +4,12 @@ Wants=network-online.target
 After=network.target network-online.target
 
 [Service]
+Type=simple
 Environment="PERLLIB=WEBMIN_LIBDIR"
-ExecStart=WEBMIN_LIBDIR/miniserv.pl WEBMIN_CONFIG/miniserv.conf
-ExecStop=WEBMIN_KILLCMD $MAINPID
+ExecStart=WEBMIN_LIBDIR/miniserv.pl --nofork WEBMIN_CONFIG/miniserv.conf
 ExecReload=WEBMIN_KILLCMD -HUP $MAINPID
-PIDFile=WEBMIN_VAR/miniserv.pid
-Type=forking
-Restart=always
+Restart=on-failure
 RestartSec=2s
-TimeoutSec=15s
 TimeoutStopSec=300s
 
 [Install]