diff --git a/Documentation/Monitors/MariaDB-Monitor.md b/Documentation/Monitors/MariaDB-Monitor.md
index d3c1df313..519e6435b 100644
--- a/Documentation/Monitors/MariaDB-Monitor.md
+++ b/Documentation/Monitors/MariaDB-Monitor.md
@@ -243,6 +243,25 @@ users with the SUPER-privilege can write to the backend server. If temporary
 write access is required, this feature should be disabled before attempting to
 disable `read_only`. Otherwise the monitor would quickly re-enable it.
 
+### `switchover_on_low_disk_space`
+
+This feature is disabled by default. If set to `on`, when the disk space of a
+server is exhausted, it will cause the server to be put in maintenance mode.
+If the server is the current master, then a switchover will also be triggered.
+
+In order for this parameter to have any effect, `disk_space_threshold` must
+have been specified for the
+[server](../Getting-Started/Configuration-Guide.md#disk_space_threshold)
+or the [monitor](./Monitor-Common.md#disk_space_threshold), and
+[disk_space_check_interval](./Monitor-Common.md#disk_space_check_interval)
+for the monitor.
+```
+switchover_on_low_disk_space=true
+```
+Note that once the server has been put in maintenance mode, the disk space
+situation will no longer be monitored and the server will thus not automatically
+be taken out of maintanance mode even if disk space again would become available.
+
 ## Failover, switchover and auto-rejoin
 
 Starting with MaxScale 2.2.1, MariaDB Monitor supports replication cluster
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index fbb260d10..e2c02c997 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -416,10 +416,9 @@ void MariaDBMonitor::tick()
     /* log master detection failure of first master becomes available after failure */
     log_master_changes(root_master);
 
-    // Before exiting we need to store the current master into the m_master
-    // member variable of MonitorInstance so tga loaded from the journal the current master into its
-    // m_master member variable, we want the corresponding MariaDBServer into
-    // our own m_master varaible.
+    // Before exiting, we need to store the current master into the m_master
+    // member variable of MonitorInstance so that the right server will be
+    // stored to the journal.
     MonitorInstance::m_master = m_master ? m_master->m_server_base : NULL;
 }