diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 14d4387bb068d14ef8c3a5776f4204192038f4c0..c2f7a42528a453873daff015c4693d6666f66449 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -792,10 +792,12 @@ Mail Server
 -----------
 
 .. warning::
-   Unfortunately, there are some issues with ``clamav-milter``,
-   ``clamav-daemon``, and ``clamav-freshclam`` services on Debian Jessie. Once
-   the role has been applied for the first time, wait for ``clamav-freshclam``
-   service to update the ClamAV virus database, then restart all three services.
+   It may happen that the ``clamav-freshclam`` service hasn't finished
+   downloading the virus database before the ``clamav-daemon`` and
+   ``clamav-milter`` services are enabled during the initial run. If mail server
+   is not operational, you may need to wait for a little while for download to
+   finish, and then restart the ``clamav-daemon`` and ``clamav-milter``
+   services.
 
 The ``mail_server`` role can be used for setting-up a complete mail server
 solution, which includes both SMTP and IMAP service, on destination machine.
@@ -1337,6 +1339,8 @@ The role implements the following:
   the code and data.
 * Installs additional packages required for running the role (as configured).
 * Sets-up a dedicated Python virtual environment for website.
+* Install ``futures`` package in Python virtual environment (required for
+  Gunicorn in combination withg Python 2.7).
 * Install Gunicorn in Python virtual environment.
 * Installs additional packages required for running the role in Python virtual
   environment (as configured).
@@ -1414,6 +1418,14 @@ Parameters
   for calculating the user/group name for dedicated website user, as well as
   home directory of the website user (where data/code should be stored at).
 
+**futures_version** (string, optional, ``3.0.5``)
+  Version of ``futures`` package to deploy in virtual environment. Required by
+  Gunicorn when using Python 2.7. Default version is tested with the test site.
+
+**gunicorn_version** (string, optional, ``19.6.0``)
+  Version of Gunicorn to deploy in virtual environment for running the WSGI
+  application. Default version is tested with the test site.
+
 **https_tls_certificate** (string, optional, ``{{ lookup('file', tls_certificate_dir + '/' + fqdn + '_https.pem') }}``)
   X.509 certificate used for TLS for HTTPS service. The file will be stored in
   directory ``/etc/ssl/certs/`` under name ``{{ fqdn }}_https.pem``.
@@ -1455,7 +1467,9 @@ Parameters
   WSGI application that should be started by Gunicorn. The format should be
   conformant to what the ``gunicorn`` command-line tool accepts. If the
   ``use_paste`` option is enabled, the value should be equal to filename of the
-  Python Paste ini file, located in the ``code`` sub-directory.
+  Python Paste ini file, located in the ``code`` sub-directory. It should be
+  noted that in either case the value should be specsified relative to the
+  ``code`` sub-directory. I.e. don't use full paths.
 
 
 Examples
@@ -1478,6 +1492,8 @@ running a bare Django project):
       wsgi_application: django_example_com.wsgi:application
       https_tls_key: "{{ lookup('file', inventory_dir + '/tls/wsgi.example.com_https.key') }}"
       https_tls_certificate: "{{ lookup('file', inventory_dir + '/tls/wsgi.example.com_https.pem') }}"
+      futures_version: 3.0.5
+      gunicorn_version: 19.6.0
       additional_nginx_config:
         - comment: Use custom page for forbidden files.
           value: error_page 403 /static/403.html;