diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml
index 077a4d69..b291184c 100644
--- a/man/mosquitto.conf.5.xml
+++ b/man/mosquitto.conf.5.xml
@@ -1031,9 +1031,9 @@
 				<listitem>
 					<para>Set the clientid to use on the local broker. If not
 						defined, this defaults to
-						<option>local.&lt;clientid&gt;</option>. If you are
+						<option>local.&lt;remote_clientid&gt;</option>. If you are
 						bridging a broker to itself, it is important that
-						local_clientid and clientid do not match.</para>
+						local_clientid and remote_clientid do not match.</para>
 				</listitem>
 			</varlistentry>
 			<varlistentry>
@@ -1059,7 +1059,7 @@
 						notification messages to the local and remote brokers
 						giving information about the state of the bridge
 						connection. Retained messages are published to the
-						topic $SYS/broker/connection/&lt;clientid&gt;/state
+						topic $SYS/broker/connection/&lt;remote_clientid&gt;/state
 						unless otherwise set with
 						<option>notification_topic</option>s.  If the message
 						is 1 then the connection is active, or 0 if the
@@ -1073,7 +1073,7 @@
 					<para>Choose the topic on which notifications will be
 						published for this bridge. If not set the messages will
 						be sent on the topic
-						$SYS/broker/connection/&lt;clientid&gt;/state.</para>
+						$SYS/broker/connection/&lt;remote_clientid&gt;/state.</para>
 				</listitem>
 			</varlistentry>
 			<varlistentry>