diff -up quagga-0.99.18/redhat/bgpd.service.sysd quagga-0.99.18/redhat/bgpd.service
--- quagga-0.99.18/redhat/bgpd.service.sysd	2011-07-19 11:16:11.810667234 +0200
+++ quagga-0.99.18/redhat/bgpd.service	2011-07-19 11:16:11.810667234 +0200
@@ -0,0 +1,11 @@
+[Unit]
+Description=BGP routing daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff -up quagga-0.99.18/redhat/isisd.service.sysd quagga-0.99.18/redhat/isisd.service
--- quagga-0.99.18/redhat/isisd.service.sysd	2011-07-19 11:16:11.811667244 +0200
+++ quagga-0.99.18/redhat/isisd.service	2011-07-19 11:16:11.811667244 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=ISIS routing daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/isisd -d
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/ospf6d.service.sysd quagga-0.99.18/redhat/ospf6d.service
--- quagga-0.99.18/redhat/ospf6d.service.sysd	2011-07-19 11:16:11.812667254 +0200
+++ quagga-0.99.18/redhat/ospf6d.service	2011-07-19 11:16:11.812667254 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/ospfd.service.sysd quagga-0.99.18/redhat/ospfd.service
--- quagga-0.99.18/redhat/ospfd.service.sysd	2011-07-19 11:16:11.813667264 +0200
+++ quagga-0.99.18/redhat/ospfd.service	2011-07-19 11:16:11.813667264 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=OSPF routing daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/quagga.sysconfig.sysd quagga-0.99.18/redhat/quagga.sysconfig
--- quagga-0.99.18/redhat/quagga.sysconfig.sysd	2011-03-21 10:43:52.000000000 +0100
+++ quagga-0.99.18/redhat/quagga.sysconfig	2011-07-19 11:46:07.141576149 +0200
@@ -1,14 +1,13 @@
 #
 # Default: Bind all daemon vtys to the loopback(s) only
 #
-QCONFDIR="/etc/quagga"
-BGPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/bgpd.conf"
-OSPF6D_OPTS="-A ::1 -f ${QCONFDIR}/ospf6d.conf"
-OSPFD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ospfd.conf"
-RIPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ripd.conf"
-RIPNGD_OPTS="-A ::1 -f ${QCONFDIR}/ripngd.conf"
-ZEBRA_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/zebra.conf"
-ISISD_OPTS="-A ::1 -f ${QCONFDIR}/isisd.conf"
+BGPD_OPTS="-A 127.0.0.1 -f /etc/quagga/bgpd.conf"
+OSPF6D_OPTS="-A ::1 -f /etc/quagga/ospf6d.conf"
+OSPFD_OPTS="-A 127.0.0.1 -f /etc/quagga/ospfd.conf"
+RIPD_OPTS="-A 127.0.0.1 -f /etc/quagga/ripd.conf"
+RIPNGD_OPTS="-A ::1 -f /etc/quagga/ripngd.conf"
+ZEBRA_OPTS="-A 127.0.0.1 -f /etc/quagga/zebra.conf"
+ISISD_OPTS="-A ::1 -f /etc/quagga/isisd.conf"
 
 # Watchquagga configuration (please check timer values before using):
 WATCH_OPTS=""
diff -up quagga-0.99.18/redhat/ripd.service.sysd quagga-0.99.18/redhat/ripd.service
--- quagga-0.99.18/redhat/ripd.service.sysd	2011-07-19 11:16:11.815667284 +0200
+++ quagga-0.99.18/redhat/ripd.service	2011-07-19 11:16:11.815667284 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=RIP routing daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/ripd -d $RIPD_OPTS
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/ripngd.service.sysd quagga-0.99.18/redhat/ripngd.service
--- quagga-0.99.18/redhat/ripngd.service.sysd	2011-07-19 11:16:11.816667293 +0200
+++ quagga-0.99.18/redhat/ripngd.service	2011-07-19 11:16:11.816667293 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/watchquagga.service.sysd quagga-0.99.18/redhat/watchquagga.service
--- quagga-0.99.18/redhat/watchquagga.service.sysd	2011-07-19 11:16:11.817667302 +0200
+++ quagga-0.99.18/redhat/watchquagga.service	2011-07-19 11:16:11.817667302 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=Quagga watchdog for use with Zebra
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/quagga
+ExecStart=/usr/sbin/watchquagga -d $WATCH_OPTS $WATCH_DAEMONS
+
+[Install]
+WantedBy=multi-user.target
+
diff -up quagga-0.99.18/redhat/zebra.service.sysd quagga-0.99.18/redhat/zebra.service
--- quagga-0.99.18/redhat/zebra.service.sysd	2011-07-19 11:16:11.818667311 +0200
+++ quagga-0.99.18/redhat/zebra.service	2011-07-19 11:16:11.818667311 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=GNU Zebra routing manager
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/quagga
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS
+
+[Install]
+WantedBy=multi-user.target