diff --git a/docs/gw/mqtt.rst b/docs/gw/mqtt.rst
index 6b6b81e7..0027e2a5 100644
--- a/docs/gw/mqtt.rst
+++ b/docs/gw/mqtt.rst
@@ -12,6 +12,7 @@ following:
     [mqtt]
     host=localhost
     port=883
+    tls=true
     user=glances
     password=glances
     topic=glances
@@ -22,3 +23,7 @@ and run Glances with:
 .. code-block:: console
 
     $ glances --export mqtt
+
+The topic_structure field aims at configuring the way stats are exported to MQTT (see #1798):
+- per-metric: one event per metric (default behavor)
+- per-plugin: one event per plugin
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index a23fc394..7ca36a01 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GLANCES" "1" "Jan 24, 2021" "3.1.6.1" "Glances"
+.TH "GLANCES" "1" "Jan 30, 2021" "3.1.7_beta" "Glances"
 .SH NAME
 glances \- An eye on your system
 .
diff --git a/glances/exports/glances_mqtt.py b/glances/exports/glances_mqtt.py
index e64088d4..c4dc98ef 100644
--- a/glances/exports/glances_mqtt.py
+++ b/glances/exports/glances_mqtt.py
@@ -2,7 +2,7 @@
 #
 # This file is part of Glances.
 #
-# Copyright (C) 2019 Nicolargo <nicolas@nicolargo.com>
+# Copyright (C) 2021 Nicolargo <nicolas@nicolargo.com>
 #
 # Glances is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by