diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index a8eabe99b..e66228dc0 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -110,6 +110,13 @@ Add ``'modoboa.dnstools'`` to ``MODOBOA_APPS``:
       'modoboa.dnstools',
    )
 
+Add the following new settings:
+
+.. sourcecode:: python
+
+   CSRF_COOKIE_SECURE = True
+   SESSION_COOKIE_SECURE = True
+
 modoboa-postfix-autoreply 1.5.0
 ===============================
 
diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 0b16ce2ea..cfd0fc5b7 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -50,6 +50,8 @@ SITE_ID = 1
 # Security settings
 
 X_FRAME_OPTIONS = "SAMEORIGIN"
+CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_SECURE = True
 
 # Application definition