diff --git a/debian/idzebra-2.0-utils.zebrasrv.service b/debian/idzebra-2.0-utils.zebrasrv.service
index c5975971..efee1a35 100644
--- a/debian/idzebra-2.0-utils.zebrasrv.service
+++ b/debian/idzebra-2.0-utils.zebrasrv.service
@@ -6,11 +6,11 @@ Documentation=man:zebrasrv(8)
 After=network.target
 
 [Service]
-Type=forking
+Type=exec
 EnvironmentFile=/etc/default/zebrasrv
-ExecStart=/bin/sh -c "exec ${DAEMON} ${OPTIONS} -p /run/zebrasrv.pid -D"
-PIDFile=/run/zebrasrv.pid
-Restart=on-abnormal
+ExecStart=/bin/sh -c "exec ${DAEMON} ${OPTIONS}"
+ExecReload=kill -HUP $MAINPID
+Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target
diff --git a/rpm/zebrasrv.service b/rpm/zebrasrv.service
index 2de813e0..a8800d6c 100644
--- a/rpm/zebrasrv.service
+++ b/rpm/zebrasrv.service
@@ -6,11 +6,11 @@ Documentation=man:zebrasrv(8)
 After=network.target
 
 [Service]
-Type=forking
+Type=exec
 EnvironmentFile=/etc/sysconfig/zebrasrv
-ExecStart=/bin/sh -c "exec ${DAEMON} ${OPTIONS} -p /run/zebrasrv.pid -D"
-PIDFile=/run/zebrasrv.pid
-Restart=on-abnormal
+ExecStart=/bin/sh -c "exec ${DAEMON} ${OPTIONS}"
+ExecReload=kill -HUP $MAINPID
+Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target