diff --git a/source/management-server/_database.rst b/source/management-server/_database.rst
index 793367b..4fd5f9c 100644
--- a/source/management-server/_database.rst
+++ b/source/management-server/_database.rst
@@ -213,6 +213,7 @@
 
    You should get the output message “CloudStack Management Server setup is
    done.”
+   If the servlet container is Tomcat7 the argument --tomcat7 must be used.
 
 
 .. _install-database-on-separate-node:
diff --git a/source/management-server/_second_mgt.rst b/source/management-server/_second_mgt.rst
index 2b7c341..a4bd467 100644
--- a/source/management-server/_second_mgt.rst
+++ b/source/management-server/_second_mgt.rst
@@ -63,6 +63,7 @@
       cloudstack-setup-management
 
    The Management Server on this node should now be running.
+   If the servlet container is Tomcat7 the argument --tomcat7 must be used.
 
 #. Repeat these steps on each additional Management Server.
 
diff --git a/source/qig.rst b/source/qig.rst
index 8d761d2..f955b59 100644
--- a/source/qig.rst
+++ b/source/qig.rst
@@ -407,6 +407,8 @@
 
    # cloudstack-setup-management
 
+If the servlet container is Tomcat7 the argument --tomcat7 must be used.
+
 
 System Template Setup
 ~~~~~~~~~~~~~~~~~~~~~