diff --git a/.env.dist b/.env.dist
index 79c18d94..1b70cacc 100644
--- a/.env.dist
+++ b/.env.dist
@@ -45,6 +45,9 @@ WEBMAIL=none
 # Expose the admin interface in publicly (values: yes, no)
 EXPOSE_ADMIN=no
 
+# Use Letsencrypt to generate a TLS certificate (uncomment to enable)
+# ENABLE_CERTBOT=True
+
 ###################################
 # Mail settings
 ###################################
@@ -67,5 +70,5 @@ FETCHMAIL_DELAY=600
 # Developers
 ###################################
 
-# Set this to enable debugging globally
-DEBUG=False
+# Uncomment this to enable debugging globally
+# DEBUG=True
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96e9c7d6..e8815ebc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ Notable changes to this project are documented in the current file. For more
 details about individual changes, see the Git log. You should read this before
 upgrading Freposte.io as some changes will include useful notes.
 
+v1.4.0 - unreleased
+-------------------
+
+- Global: make sure that ``DEBUG`` is commented in your ``.env`` if you
+  disabled it and update your ``docker-compose.yml``
+- Security: disable verbose logging of passwords by the fetchmail script
+- Feature: certbot certificate generation is available, uncomment
+  ``ENABLE_CERTBOT`` in your ``.env`` to enable it
+- L10N: french loca is now available
+
 v1.3.0 - 2016-11-05
 -------------------
 
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index d40accea..ccd026b7 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -83,6 +83,7 @@ services:
     volumes:
       - "$ROOT/data:/data"
       - "$ROOT/dkim:/dkim"
+      - "$ROOT/certs:/certs"
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
   webmail: