diff --git a/doc/user/index.rst b/doc/user/index.rst
index 6c3b14e062..416c51f13b 100644
--- a/doc/user/index.rst
+++ b/doc/user/index.rst
@@ -58,6 +58,7 @@ Protocols
    vnc
    vrrp
    bmp
+   watchfrr
 
 ########
 Appendix
diff --git a/doc/user/subdir.am b/doc/user/subdir.am
index 0f0a8a0774..ce519fbfbf 100644
--- a/doc/user/subdir.am
+++ b/doc/user/subdir.am
@@ -43,6 +43,7 @@ user_RSTFILES = \
 	doc/user/zebra.rst \
 	doc/user/bfd.rst \
 	doc/user/flowspec.rst \
+	doc/user/watchfrr.rst \
 	# end
 
 EXTRA_DIST += \
diff --git a/doc/user/watchfrr.rst b/doc/user/watchfrr.rst
new file mode 100644
index 0000000000..df04a1e375
--- /dev/null
+++ b/doc/user/watchfrr.rst
@@ -0,0 +1,30 @@
+.. _watchfrr:
+
+********
+WATCHFRR
+********
+
+:abbr:`WATCHFRR` is a daemon that handles failed daemon processes and
+intelligently restarts them as needed.
+
+Starting WATCHFRR
+=================
+
+WATCHFRR is started as per normal systemd startup and typically does not
+require end users management.
+
+WATCHFRR commands
+=================
+
+.. index:: show watchfrr
+.. clicmd:: show watchfrr
+
+   Give status information about the state of the different daemons being
+   watched by WATCHFRR
+
+.. index:: [no] watchfrr ignore DAEMON
+.. clicmd:: [no] watchfrr ignore DAEMON
+
+   Tell WATCHFRR to ignore a particular DAEMON if it goes unresponsive.
+   This is particularly useful when you are a developer and need to debug
+   a working system, without watchfrr pulling the rug out from under you.