diff --git a/packaging/cfengine-community/cfengine-community.spec.in b/packaging/cfengine-community/cfengine-community.spec.in
index 293d8d2ad..737d133c0 100644
--- a/packaging/cfengine-community/cfengine-community.spec.in
+++ b/packaging/cfengine-community/cfengine-community.spec.in
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
 # Create symlinks to /usr/local/sbin and /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
-for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support; do
+for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do
   ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
   ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
 done
@@ -115,6 +115,7 @@ done
 %prefix/bin/cf-serverd
 %prefix/bin/cf-support
 %prefix/bin/cf-upgrade
+%prefix/bin/cf-watchd
 # Libraries
 %dir %prefix/lib
 %prefix/lib/lib*.so*
@@ -179,6 +180,7 @@ done
 /usr/local/sbin/cf-secret
 /usr/local/sbin/cf-serverd
 /usr/local/sbin/cf-support
+/usr/local/sbin/cf-watchd
 
 # Symlinks to /usr/sbin (included in secure_path)
 /usr/sbin/cf-agent
@@ -192,6 +194,7 @@ done
 /usr/sbin/cf-secret
 /usr/sbin/cf-serverd
 /usr/sbin/cf-support
+/usr/sbin/cf-watchd
 
 # Documentation
 %defattr(644,root,root,755)
diff --git a/packaging/cfengine-community/debian/cfengine-community.install b/packaging/cfengine-community/debian/cfengine-community.install
index 1a169b303..62f01e8cf 100644
--- a/packaging/cfengine-community/debian/cfengine-community.install
+++ b/packaging/cfengine-community/debian/cfengine-community.install
@@ -17,6 +17,7 @@
 /var/cfengine/bin/cf-serverd
 /var/cfengine/bin/cf-support
 /var/cfengine/bin/cf-upgrade
+/var/cfengine/bin/cf-watchd
 /var/cfengine/bin/getfacl
 /var/cfengine/lib/lib*.so.*
 /var/cfengine/lib/liblmdb.so
diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
index 13804bb93..c0fd17429 100644
--- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
+++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
@@ -173,7 +173,7 @@ chmod 755 $RPM_BUILD_ROOT%prefix/share/cf-support-nova-hub.sh
 # Create symlinks to /usr/local/sbin and /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
-for binary in cf-agent cf-check cf-execd cf-hub cf-key cf-monitord cf-net cf-promises cf-reactor cf-runagent cf-secret cf-serverd cf-support cfbs; do
+for binary in cf-agent cf-check cf-execd cf-hub cf-key cf-monitord cf-net cf-promises cf-reactor cf-runagent cf-secret cf-serverd cf-support cf-watchd cfbs; do
   if [ -f $RPM_BUILD_ROOT%{prefix}/bin/$binary ]; then
     ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
     ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
@@ -221,6 +221,7 @@ exit 0
 %prefix/bin/cf-secret
 %prefix/bin/cf-serverd
 %prefix/bin/cf-support
+%prefix/bin/cf-watchd
 # Nova-only binaries
 %prefix/bin/cf-hub
 %prefix/bin/cf-reactor
@@ -363,6 +364,7 @@ exit 0
 /usr/local/sbin/cf-secret
 /usr/local/sbin/cf-serverd
 /usr/local/sbin/cf-support
+/usr/local/sbin/cf-watchd
 %if %{?rhel}%{!?rhel:0} >= 7
 /usr/local/sbin/cfbs
 %endif
@@ -381,6 +383,7 @@ exit 0
 /usr/sbin/cf-secret
 /usr/sbin/cf-serverd
 /usr/sbin/cf-support
+/usr/sbin/cf-watchd
 %if %{?rhel}%{!?rhel:0} >= 7
 /usr/sbin/cfbs
 %endif
diff --git a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install
index f13d39715..99701ab5c 100644
--- a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install
+++ b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install
@@ -21,6 +21,7 @@
 /var/cfengine/bin/cf-secret
 /var/cfengine/bin/cf-serverd
 /var/cfengine/bin/cf-support
+/var/cfengine/bin/cf-watchd
 /var/cfengine/bin/rsync
 /var/cfengine/bin/cfengine3-nova-hub-init-d.sh
 /var/cfengine/bin/git
diff --git a/packaging/cfengine-nova/cfengine-nova.spec.aix.in b/packaging/cfengine-nova/cfengine-nova.spec.aix.in
index 1fae9f57d..5f14a0fec 100644
--- a/packaging/cfengine-nova/cfengine-nova.spec.aix.in
+++ b/packaging/cfengine-nova/cfengine-nova.spec.aix.in
@@ -73,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %prefix/bin/cf-serverd
 %prefix/bin/cf-support
 %prefix/bin/cf-upgrade
+%prefix/bin/cf-watchd
 # Libraries
 %dir %prefix/lib
 %prefix/lib/lib*.so*
diff --git a/packaging/cfengine-nova/cfengine-nova.spec.in b/packaging/cfengine-nova/cfengine-nova.spec.in
index c2cc14eaa..27b2184c4 100644
--- a/packaging/cfengine-nova/cfengine-nova.spec.in
+++ b/packaging/cfengine-nova/cfengine-nova.spec.in
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
 # Create symlinks to /usr/local/sbin and /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
-for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support; do
+for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do
   ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
   ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
 done
@@ -128,6 +128,7 @@ exit 0
 %prefix/bin/cf-serverd
 %prefix/bin/cf-support
 %prefix/bin/cf-upgrade
+%prefix/bin/cf-watchd
 # Libraries
 %dir %prefix/lib
 %prefix/lib/lib*.so*
@@ -191,6 +192,7 @@ exit 0
 /usr/local/sbin/cf-secret
 /usr/local/sbin/cf-serverd
 /usr/local/sbin/cf-support
+/usr/local/sbin/cf-watchd
 
 # Symlinks to /usr/sbin (included in secure_path)
 /usr/sbin/cf-agent
@@ -204,6 +206,7 @@ exit 0
 /usr/sbin/cf-secret
 /usr/sbin/cf-serverd
 /usr/sbin/cf-support
+/usr/sbin/cf-watchd
 
 # Documentation
 %defattr(644,root,root,755)
diff --git a/packaging/cfengine-nova/cfengine-nova.wxs b/packaging/cfengine-nova/cfengine-nova.wxs
index aedba9fbb..272466f73 100644
--- a/packaging/cfengine-nova/cfengine-nova.wxs
+++ b/packaging/cfengine-nova/cfengine-nova.wxs
@@ -87,6 +87,9 @@
                 <Environment Id='Path' Name='Path' Value='[dir_bin]' Separator=';' Action='set' Part='last' System='yes' />
                 <File Id='cf_serverd.exe' Name='cf-serverd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-serverd.exe' />
               </Component>
+              <Component Id='cf_watchd.exe' Guid='D0017C79-0DE0-4AD6-99AC-55B2A84BF987' Win64='$(var.isWin64)'>
+                <File Id='cf_watchd.exe' Name='cf-watchd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-watchd.exe' />
+              </Component>
               <Component Id='diff.exe' Guid='A343B6FD-A0E9-468A-8678-84647C609DC6' Win64='$(var.isWin64)'>
                 <File Id='diff.exe' Name='diff.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\diff.exe' />
               </Component>
@@ -201,6 +204,7 @@
             <ComponentRef Id='cf_promises.exe' />
             <ComponentRef Id='cf_runagent.exe' />
             <ComponentRef Id='cf_serverd.exe' />
+            <ComponentRef Id='cf_watchd.exe' />
             <ComponentRef Id='cf_secret.exe' />
             <ComponentRef Id='cf_upgrade.exe' />
             <ComponentRef Id='mdb_copy.exe' />
diff --git a/packaging/cfengine-nova/debian/cfengine-nova.install b/packaging/cfengine-nova/debian/cfengine-nova.install
index 5e36d5270..7031c320f 100644
--- a/packaging/cfengine-nova/debian/cfengine-nova.install
+++ b/packaging/cfengine-nova/debian/cfengine-nova.install
@@ -17,6 +17,7 @@
 /var/cfengine/bin/cf-secret
 /var/cfengine/bin/cf-support
 /var/cfengine/bin/cf-upgrade
+/var/cfengine/bin/cf-watchd
 /var/cfengine/lib/lib*.so.*
 /var/cfengine/lib/python/*
 /var/cfengine/lib/cfengine-enterprise.so
diff --git a/packaging/cfengine-nova/freebsd/pkg-plist.foot b/packaging/cfengine-nova/freebsd/pkg-plist.foot
index 3a6ef6472..f7ce43aa3 100644
--- a/packaging/cfengine-nova/freebsd/pkg-plist.foot
+++ b/packaging/cfengine-nova/freebsd/pkg-plist.foot
@@ -9,6 +9,7 @@
 @unexec /bin/pkill -9 cf-execd > /dev/null 2>&1
 @unexec /bin/pkill -9 cf-monitord > /dev/null 2>&1
 @unexec /bin/pkill -9 cf-serverd > /dev/null 2>&1
+@unexec /bin/pkill -9 cf-watchd > /dev/null 2>&1
 @unexec /bin/pkill -9 cf-hub > /dev/null 2>&1
 @unexec /bin/pkill -9 cf-reactor > /dev/null 2>&1
 @unexec /bin/rm -rf /var/cfengine/rc.d > /dev/null 2>&1
@@ -25,3 +26,4 @@
 @unexec /bin/rm -f /var/cfengine/bin/cf-secret > /dev/null 2>&1
 @unexec /bin/rm -f /var/cfengine/bin/cf-serverd > /dev/null 2>&1
 @unexec /bin/rm -f /var/cfengine/bin/cf-support > /dev/null 2>&1
+@unexec /bin/rm -f /var/cfengine/bin/cf-watchd > /dev/null 2>&1
diff --git a/packaging/common/cfengine-hub/postinstall.sh b/packaging/common/cfengine-hub/postinstall.sh
index 108e6b5b6..096647c0d 100644
--- a/packaging/common/cfengine-hub/postinstall.sh
+++ b/packaging/common/cfengine-hub/postinstall.sh
@@ -273,7 +273,7 @@ fi
 
 for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent \
          cf-hub cf-reactor \
-         cf-net cf-check cf-support \
+         cf-net cf-check cf-support cf-watchd \
          cfbs;
 do
   if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ] && [ -d /usr/local/sbin ]; then
diff --git a/packaging/common/cfengine-hub/postremove.sh b/packaging/common/cfengine-hub/postremove.sh
index 7f8a6d444..1ea58b679 100644
--- a/packaging/common/cfengine-hub/postremove.sh
+++ b/packaging/common/cfengine-hub/postremove.sh
@@ -28,7 +28,7 @@ fi
 
 if [ `os_type` != redhat ]; then
   # These links are handled in .spec file for RedHat
-  for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support; do
+  for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support cf-watchd; do
     rm -f /usr/local/sbin/$i || true
   done
 fi
diff --git a/packaging/common/cfengine-non-hub/postinstall.sh b/packaging/common/cfengine-non-hub/postinstall.sh
index c7d36cb6a..abfe61907 100644
--- a/packaging/common/cfengine-non-hub/postinstall.sh
+++ b/packaging/common/cfengine-non-hub/postinstall.sh
@@ -45,7 +45,7 @@ if [ -f $PREFIX/bin/cf-twin ]; then
 fi
 
 mkdir -p /usr/local/sbin
-for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support;
+for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd;
 do
   if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ]; then
     # These links are handled in .spec file for RedHat
diff --git a/packaging/common/cfengine-non-hub/postremove.sh b/packaging/common/cfengine-non-hub/postremove.sh
index a634bcf94..48355ac54 100644
--- a/packaging/common/cfengine-non-hub/postremove.sh
+++ b/packaging/common/cfengine-non-hub/postremove.sh
@@ -9,7 +9,7 @@ esac
 
 if [ `os_type` != redhat ]; then
   # These links are handled in .spec file for RedHat
-  for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support; do
+  for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd; do
     rm -f /usr/local/sbin/$i || true
   done
 fi