diff --git a/doc/5-service-monitoring.md b/doc/5-service-monitoring.md
index 0ce8cac3c..42184b75e 100644
--- a/doc/5-service-monitoring.md
+++ b/doc/5-service-monitoring.md
@@ -144,14 +144,14 @@ already ships various examples like
## Database Monitoring
-* MySQL ([mysql_health](10-icinga-template-library.md#plugin-contrib-command-mysql_health), [mysql](10-icinga-template-library.md#plugin-check-command-mysql), [mysql_query](10-icinga-template-library.md#plugin-check-command-mysql-query))
-* PostgreSQL ([postgres](10-icinga-template-library.md#plugin-contrib-command-postgres))
-* Oracle ([oracle_health](10-icinga-template-library.md#plugin-contrib-command-oracle_health))
-* MSSQL ([mssql_health](10-icinga-template-library.md#plugin-contrib-command-mssql_health))
-* DB2 ([db2_health](10-icinga-template-library.md#plugin-contrib-command-db2_health))
-* MongoDB ([db2_health](10-icinga-template-library.md#plugin-contrib-command-mongodb))
-* Elasticsearch ([db2_health](10-icinga-template-library.md#plugin-contrib-command-elasticsearch))
-* Redis ([db2_health](10-icinga-template-library.md#plugin-contrib-command-redis))
+* MySQL/MariaDB: [mysql_health](10-icinga-template-library.md#plugin-contrib-command-mysql_health), [mysql](10-icinga-template-library.md#plugin-check-command-mysql), [mysql_query](10-icinga-template-library.md#plugin-check-command-mysql-query)
+* PostgreSQL: [postgres](10-icinga-template-library.md#plugin-contrib-command-postgres)
+* Oracle: [oracle_health](10-icinga-template-library.md#plugin-contrib-command-oracle_health)
+* MSSQL: [mssql_health](10-icinga-template-library.md#plugin-contrib-command-mssql_health)
+* DB2: [db2_health](10-icinga-template-library.md#plugin-contrib-command-db2_health)
+* MongoDB: [mongodb](10-icinga-template-library.md#plugin-contrib-command-mongodb)
+* Elasticsearch: [elasticsearch](10-icinga-template-library.md#plugin-contrib-command-elasticsearch)
+* Redis: [redis](10-icinga-template-library.md#plugin-contrib-command-redis)
## SNMP Monitoring
@@ -198,9 +198,14 @@ already ships various examples like
## Virtualization Monitoring
+## VMWare Monitoring
+
* [esxi_hardware](10-icinga-template-library.md#plugin-contrib-command-esxi-hardware)
* [VMWare](10-icinga-template-library.md#plugin-contrib-vmware)
+**Tip**: If you are encountering timeouts using the VMWare Perl SDK
+check [this blog entry](http://www.claudiokuenzler.com/blog/650/slow-vmware-perl-sdk-soap-request-error-libwww-version).
+
## SAP Monitoring
* [check_sap_health](https://labs.consol.de/nagios/check_sap_health/index.html)