diff --git a/FAILOVER.rst b/FAILOVER.rst
index 607d93ca..ea6fe050 100644
--- a/FAILOVER.rst
+++ b/FAILOVER.rst
@@ -203,6 +203,9 @@ repmgr will also ask for the superuser password on the witness database so
 it can reconnect when needed (the command line option --initdb-no-pwprompt
 will set up a password-less superuser).
 
+By default the witness server will listen on port 5499; this value can be overridden
+with the -l/--local-port option.
+
 Start the repmgrd daemons
 -------------------------
 
diff --git a/repmgr.c b/repmgr.c
index 3698a6c3..93df4dc4 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -58,7 +58,8 @@
 #define TABLESPACE_MAP "tablespace_map"
 #endif
 
-#define WITNESS_DEFAULT_PORT "5499"
+#define WITNESS_DEFAULT_PORT "5499" /* If this value is ever changed, remember
+									 * to update comments and documentation */
 
 #define NO_ACTION			0		/* Dummy default action */
 #define MASTER_REGISTER		1