diff --git a/webmin.service b/webmin.service
index 1eea3d8..8302cef 100644
--- a/webmin.service
+++ b/webmin.service
@@ -1,12 +1,13 @@
 [Unit]
-Description=Webmin
+Description=Webmin server daemon
+After=syslog.target
 
 [Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/webmin/start
-ExecStop=/etc/webmin/stop
-ExecReload=/etc/webmin/reload
+ExecStart=/etc/webmin/.start-init
+ExecStop=/etc/webmin/.stop-init
+PIDFile=/var/log/webmin/miniserv.pid
+Type=forking
+KillMode=none
 
 [Install]
 WantedBy=multi-user.target
diff --git a/webmin.spec b/webmin.spec
index 3ba9f91..3363111 100644
--- a/webmin.spec
+++ b/webmin.spec
@@ -1,6 +1,6 @@
 Name:          webmin
 Version:       1.994
-Release:       1mamba
+Release:       2mamba
 Summary:       A web-based interface for system administration for Unix
 Group:         Applications/Web
 Vendor:        openmamba
@@ -143,6 +143,9 @@ fi
 %doc LICENCE
 
 %changelog
+* Fri Jun 03 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.994-2mamba
+- fix systemd service
+
 * Wed May 25 2022 Automatic Build System <autodist@mambasoft.it> 1.994-1mamba
 - automatic version update by autodist