diff --git a/ChangeLog.txt b/ChangeLog.txt
index 402fc43d..efdbc9ff 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -14,6 +14,7 @@ Broker:
a message with empty topic and topic alias set, but the topic alias hadn't
already been configured on the broker. This has been fixed to send a
protocol error, as per section 3.3.4 of the specification.
+- Note in the man pages that SIGHUP reloads TLS certificates. Closes #2037.
Apps:
- Allow command line arguments to override config file options in
diff --git a/man/mosquitto.8.xml b/man/mosquitto.8.xml
index e00bdd6d..fe2b2d9d 100644
--- a/man/mosquitto.8.xml
+++ b/man/mosquitto.8.xml
@@ -431,6 +431,8 @@
be reloaded without restarting. See
mosquitto.conf5
for details.
+ If TLS certificates are in use, then mosquitto will
+ also reload certificate on receiving a SIGHUP.
diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml
index 6ea2b10f..cd76cd5f 100644
--- a/man/mosquitto.conf.5.xml
+++ b/man/mosquitto.conf.5.xml
@@ -1275,6 +1275,12 @@ log_timestamp_format %Y-%m-%dT%H:%M:%S
option and must be present
to enable certificate based TLS encryption.
+
+ The certificate pointed to by this option will be
+ reloaded when Mosquitto receives a SIGHUP signal.
+ This can be used to load new certificates prior to
+ the existing ones expiring.
+
@@ -1328,6 +1334,12 @@ openssl dhparam -out dhparam.pem 2048
option and must be present
to enable certificate based TLS encryption.
+
+ The private key pointed to by this option will be
+ reloaded when Mosquitto receives a SIGHUP signal.
+ This can be used to load new keys prior to
+ the existing ones expiring.
+