diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index be524d4aa6..d3f3af2398 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
@@ -26,6 +26,8 @@ nocross="http://ix.io/1rQ6"
 system_groups="_frrvty"
 system_accounts="_frr"
 _frr_groups="_frrvty"
+_daemons="zebra staticd bgpd ospfd ospf6d ripd ripngd isisd pimd ldpd nhrpd
+ eigrpd babeld sharpd pbrd bfdd fabricd"
 
 pre_configure() {
 	autoreconf -fi
@@ -35,7 +37,7 @@ post_install() {
 	# LSB init script is not needed
 	rm -f -- "${DESTDIR}/usr/bin/frr"
 
-	# frr-reload wrapper script hardcodes sbindir as usr/lib/frr, so avoid it
+	# frr-reload wrapper script hardcodes sbindir as usr/lib/frr, avoid it
 	rm -f -- "${DESTDIR}/usr/bin/frr-reload"
 	mv "${DESTDIR}/usr/bin/frr-reload.py" "${DESTDIR}/usr/bin/frr-reload"
 
@@ -43,7 +45,7 @@ post_install() {
 	vsv frr-generic
 	vmkdir etc/frr 0755
 	vinstall /dev/null 0640 etc/frr vtysh.conf
-	for daemon in zebra staticd bgpd ospfd ospf6d ripd ripngd isisd pimd ldpd nhrpd eigrpd babeld sharpd pbrd bfdd fabricd; do
+	for daemon in ${_daemons}; do
 		vinstall /dev/null 0640 etc/frr "${daemon}.conf"
 		vsv "${daemon}"
 	done
@@ -51,7 +53,7 @@ post_install() {
 
 frr-flush_package() {
 	short_desc+=" - route flushing tool"
-	depends="iproute2 ${srcpkgname}-${version}_${revision}"
+	depends="iproute2 ${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/frr-flush
 	}
@@ -59,7 +61,7 @@ frr-flush_package() {
 
 frr-reload_package() {
 	short_desc+=" - reload tool"
-	depends="python-ipaddr python ${srcpkgname}-${version}_${revision}"
+	depends="python-ipaddr python ${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/frr-reload
 	}