diff --git a/quagga/babeld.service b/quagga/babeld.service
index 5b28480..aa107af 100644
--- a/quagga/babeld.service
+++ b/quagga/babeld.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=Babel routing daemon
+Documentation=man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/babeld.conf
 
 [Service]
-ExecStart=/usr/sbin/babeld
+Type=forking
+PIDFile=/run/quagga/babeld.pid
+ExecStart=/usr/sbin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/bgpd.service b/quagga/bgpd.service
index 21ac18c..aae58be 100644
--- a/quagga/bgpd.service
+++ b/quagga/bgpd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/bgpd.conf
 
 [Service]
-ExecStart=/usr/sbin/bgpd
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/isisd.service b/quagga/isisd.service
index 2989469..fa5a716 100644
--- a/quagga/isisd.service
+++ b/quagga/isisd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/isisd.conf
 
 [Service]
-ExecStart=/usr/sbin/isisd
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/ospf6d.service b/quagga/ospf6d.service
index 31194fc..eacb891 100644
--- a/quagga/ospf6d.service
+++ b/quagga/ospf6d.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospf6d.conf
 
 [Service]
-ExecStart=/usr/sbin/ospf6d
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/ospfd.service b/quagga/ospfd.service
index f864aa2..57a946f 100644
--- a/quagga/ospfd.service
+++ b/quagga/ospfd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospfd.conf
 
 [Service]
-ExecStart=/usr/sbin/ospfd
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/ripd.service b/quagga/ripd.service
index 22716e2..bf7c5ac 100644
--- a/quagga/ripd.service
+++ b/quagga/ripd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripd.conf
 
 [Service]
-ExecStart=/usr/sbin/ripd
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/ripngd.service b/quagga/ripngd.service
index 9ac51bd..465263b 100644
--- a/quagga/ripngd.service
+++ b/quagga/ripngd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripngd.conf
 
 [Service]
-ExecStart=/usr/sbin/ripngd
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/quagga/zebra.service b/quagga/zebra.service
index 0bba039..c870708 100644
--- a/quagga/zebra.service
+++ b/quagga/zebra.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
 After=network.target
 ConditionPathExists=/etc/quagga/zebra.conf
 
 [Service]
-ExecStartPre=/usr/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra
+Type=forking
+PIDFile=/run/quagga/zebra.pid
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]