diff -Naupr frr-frr-6.0_orig/redhat/babeld.service frr-frr-6.0/redhat/babeld.service
--- frr-frr-6.0_orig/redhat/babeld.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/babeld.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=Babel routing daemon
+Documentation=man:babeld(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/babeld.pid
+ExecStart=/usr/bin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/bfdd.service frr-frr-6.0/redhat/bfdd.service
--- frr-frr-6.0_orig/redhat/bfdd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/bfdd.service	2018-10-12 10:05:33.009496639 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=Communication failure detection daemon
+Documentation=man:bfdd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/bfdd.pid
+ExecStart=/usr/bin/bfdd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/bgpd.service frr-frr-6.0/redhat/bgpd.service
--- frr-frr-6.0_orig/redhat/bgpd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/bgpd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/bgpd.pid
+ExecStart=/usr/bin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/eigrpd.service frr-frr-6.0/redhat/eigrpd.service
--- frr-frr-6.0_orig/redhat/eigrpd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/eigrpd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=EIGRP routing daemon
+Documentation=man:eigrpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/eigrpd.pid
+ExecStart=/usr/bin/eigrpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/isisd.service frr-frr-6.0/redhat/isisd.service
--- frr-frr-6.0_orig/redhat/isisd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/isisd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/isisd.pid
+ExecStart=/usr/bin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ldpd.service frr-frr-6.0/redhat/ldpd.service
--- frr-frr-6.0_orig/redhat/ldpd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ldpd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=LDP engine
+Documentation=man:ldpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ldpd.pid
+ExecStart=/usr/bin/ldpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/nhrpd.service frr-frr-6.0/redhat/nhrpd.service
--- frr-frr-6.0_orig/redhat/nhrpd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/nhrpd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=NHRP daemon
+Documentation=man:nhrpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/nhrpd.pid
+ExecStart=/usr/bin/nhrpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ospf6d.service frr-frr-6.0/redhat/ospf6d.service
--- frr-frr-6.0_orig/redhat/ospf6d.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ospf6d.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ospf6d.pid
+ExecStart=/usr/bin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ospfd-instance@.service frr-frr-6.0/redhat/ospfd-instance@.service
--- frr-frr-6.0_orig/redhat/ospfd-instance@.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ospfd-instance@.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon instance %i
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service ospfd.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ospfd-%i.pid
+ExecStart=/usr/bin/ospfd -n %i -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ospfd.service frr-frr-6.0/redhat/ospfd.service
--- frr-frr-6.0_orig/redhat/ospfd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ospfd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ospfd.pid
+ExecStart=/usr/bin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/pbrd.service frr-frr-6.0/redhat/pbrd.service
--- frr-frr-6.0_orig/redhat/pbrd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/pbrd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=PBR routing daemon
+Documentation=man:pbrd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/pbrd.pid
+ExecStart=/usr/bin/pbrd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/pimd.service frr-frr-6.0/redhat/pimd.service
--- frr-frr-6.0_orig/redhat/pimd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/pimd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,14 @@
+[Unit]
+Description=PIM multicast routing engine
+Documentation=man:pimd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/pimd.pid
+ExecStart=/usr/bin/pimd -d
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ripd.service frr-frr-6.0/redhat/ripd.service
--- frr-frr-6.0_orig/redhat/ripd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ripd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ripd.pid
+ExecStart=/usr/bin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/ripngd.service frr-frr-6.0/redhat/ripngd.service
--- frr-frr-6.0_orig/redhat/ripngd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/ripngd.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/ripngd.pid
+ExecStart=/usr/bin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/staticd.service frr-frr-6.0/redhat/staticd.service
--- frr-frr-6.0_orig/redhat/staticd.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/staticd.service	2018-10-12 10:13:47.017305494 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=Zebra daemon responsible for management of static routes
+Documentation=man:staticd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+
+[Service]
+Type=forking
+PIDFile=/run/frr/staticd.pid
+ExecStart=/usr/bin/staticd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff -Naupr frr-frr-6.0_orig/redhat/zebra.service frr-frr-6.0/redhat/zebra.service
--- frr-frr-6.0_orig/redhat/zebra.service	1970-01-01 07:00:00.000000000 +0700
+++ frr-frr-6.0/redhat/zebra.service	2018-10-12 09:58:16.424665052 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/frr/zebra.pid
+ExecStartPre=/usr/bin/ip route flush proto zebra
+ExecStart=/usr/bin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target