diff --git a/README.md b/README.md
index af7e3b7..b8b62e0 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ the host running the containers and are imported at runtime in the containers.
 
 * `/opt/mailman/web/settings_local.py` : This is the Django configuration that
   is imported by the [existing configuration][2]
-  provided by the mailman-web container. **This file is referred to as 
+  provided by the mailman-web container. **This file is referred to as
   `settings.py` in most of the Postorius and Django documentation.** To change
   or override any settings in Django/Postorius, you need to create/edit this file.
   A useful configuration for troubleshooting is `DEBUG = True`.
@@ -201,8 +201,8 @@ EMAIL_PORT = 25
 
 Alternatively, you can use the environment variables `SMTP_HOST` (defaults to
 the container's gateway), `SMTP_PORT` (defaults to `25`), `SMTP_HOST_USER` (defaults to
-an empty string), `SMTP_HOST_PASSWORD` (defaults to an empty string) and
-`SMTP_USE_TLS` (defaults to `False`).
+an empty string), `SMTP_HOST_PASSWORD` (defaults to an empty string),
+`SMTP_USE_TLS` (defaults to `False`) and `SMTP_USE_SSL` (defaults to `False`).
 
 This is required in addition to the [Setup your MTA](#setting-up-your-mta)
 section below, which covers email setup for Mailman Core.
diff --git a/postorius/mailman-web/settings.py b/postorius/mailman-web/settings.py
index 984fbc3..d701c4e 100644
--- a/postorius/mailman-web/settings.py
+++ b/postorius/mailman-web/settings.py
@@ -216,7 +216,7 @@ EMAIL_PORT = os.environ.get('SMTP_PORT', 25)
 EMAIL_HOST_USER = os.environ.get('SMTP_HOST_USER', '')
 EMAIL_HOST_PASSWORD = os.environ.get('SMTP_HOST_PASSWORD', '')
 EMAIL_USE_TLS = os.environ.get('SMTP_USE_TLS', False)
-
+EMAIL_USE_SSL = os.environ.get('SMTP_USE_SSL', False)
 
 # Compatibility with Bootstrap 3
 from django.contrib.messages import constants as messages  # flake8: noqa
diff --git a/web/README.md b/web/README.md
index 7d8d991..54bef5f 100644
--- a/web/README.md
+++ b/web/README.md
@@ -59,6 +59,9 @@ change them unless you know what you want.
 - `SMTP_USE_TLS`: Specifies wheather the SMTP connection is encrypted
   via TLS. Default is `False`.
 
+- `SMTP_USE_SSL`: Specifies wheather the SMTP connection is encrypted
+  via SSL. Default is `False`.
+
 - `DJANGO_LOG_URL`: Path to the django's log file. Defaults to
   `/opt/mailman-web-data/logs/mailmanweb.log`.
 
diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py
index 84afc49..6c2d0d0 100644
--- a/web/mailman-web/settings.py
+++ b/web/mailman-web/settings.py
@@ -221,7 +221,7 @@ EMAIL_PORT = os.environ.get('SMTP_PORT', 25)
 EMAIL_HOST_USER = os.environ.get('SMTP_HOST_USER', '')
 EMAIL_HOST_PASSWORD = os.environ.get('SMTP_HOST_PASSWORD', '')
 EMAIL_USE_TLS = os.environ.get('SMTP_USE_TLS', False)
-
+EMAIL_USE_SSL = os.environ.get('SMTP_USE_SSL', False)
 
 # Compatibility with Bootstrap 3
 from django.contrib.messages import constants as messages  # flake8: noqa