diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml
index 8d8bad72..c2caf11c 100644
--- a/man/mosquitto.conf.5.xml
+++ b/man/mosquitto.conf.5.xml
@@ -374,9 +374,9 @@
 			<varlistentry>
 				<term><option>max_queued_messages</option> <replaceable>count</replaceable></term>
 				<listitem>
-					<para>The maximum number of QoS 1 or 2 messages to hold in
-						the queue above those messages that are currently in
-						flight. Defaults to 100. Set to 0 for no maximum (not
+					<para>The maximum number of QoS 1 or 2 messages to hold in the
+						queue (per client) above those messages that are currently
+						in flight. Defaults to 100. Set to 0 for no maximum (not
 						recommended). See also the
 						<option>queue_qos0_messages</option> option.</para>
 					<para>Reloaded on reload signal.</para>
diff --git a/mosquitto.conf b/mosquitto.conf
index d06a7ccb..bbe24750 100644
--- a/mosquitto.conf
+++ b/mosquitto.conf
@@ -46,7 +46,7 @@
 # and 2 messages.
 #max_inflight_messages 20
 
-# The maximum number of QoS 1 and 2 messages to hold in a queue 
+# The maximum number of QoS 1 and 2 messages to hold in a queue per client
 # above those that are currently in-flight.  Defaults to 100. Set 
 # to 0 for no maximum (not recommended).
 # See also queue_qos0_messages.