diff --git a/Makefile b/Makefile
index 192ec4e..1219843 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
 PKG_VERSION:=0.99.21
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=99840adbe57047c90dfba6b6ed9aec7f
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/files/quagga b/files/quagga
index 0ccfb1c..b172090 100644
--- a/files/quagga
+++ b/files/quagga
@@ -33,7 +33,7 @@ DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
 DAEMON_FLAGS=-d
 WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
 WATCHQUAGGA_CMD="$0 watchrestart"
-if [ ${COMMAND} != "watchrestart" ]
+if [ ${COMMAND} != "watchrestart" -a -x "${BINDIR}/watchquagga" ]
 then
 	DAEMONS="${DAEMONS} watchquagga"
 fi