diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2afc69cf..9ced5a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,109 @@ 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.6.0 - unreleased
+-------------------
+
+- Global: Architecture of the central container (#56, #108)
+- Global: Serve documentation with docker (#601, #608)
+- Global: Travis-CI automated test build (#602)
+- Global: Abstract db access from Postfix and Dovecot (#612)
+- Global: Refactor the admin architecture and configuration management (#670)
+- Feature: Used quota in admin interface (#216)
+- Feature: User Signup (#281, #340)
+- Feature: Client setup page (#342)
+- Feature: Administration setup page (#343)
+- Feature: Visual notice whether the mx record points to mailu server (#356)
+- Feature: Option for vacation start (#362)
+- Feature: Enable enigma in Roundcube (#391)
+- Feature: Allow more charcaters as a valid email address (#443)
+- Feature: IDNA support (#446)
+- Feature: Disable user account  (#449)
+- Feature: Use fuzzy hashes in rpamd (#456, #527)
+- Feature: Enable “doveadm -A” command (#458)
+- Feature: Remove the Service Status page (#463)
+- Feature: Automated Releases (#487)
+- Feature: Support for ARC (#495)
+- Feature: Add posibilty to run webmail on root (#501)
+- Feature: Upgrade docker-compose.yml to version 3 (#539)
+- Feature: Documentation to deploy mailu on a docker swarm (#551)
+- Feature: Add full-text search support (#552)
+- Feature: Add optional Maildir-Compression (#553)
+- Feature: Preserve rspamd history on container restart (#561)
+- Feature: FAQ (#564, #677)
+- Feature: Kubernetes support (#576)
+- Feature: Option to bounce or reject email when recipient is unknown (#583, #626)
+- Feature: implement healthchecks for all containers (#631)
+- Feature: Option to send front logs to journald or syslog (#584, #661)
+- Feature: Support bcrypt and PBKDF2 (#647, #667)
+- Feature: enable http2 (#674)
+- Feature: Unbound DNS as optional service (#681)
+- Feature: Re-write test suite (#682)
+- Feature: Docker image prefixes (#702)
+- Feature: Add authentication method “login” for Outlook (#704)
+- Feature: Allow extending nginx config with overrides (#713)
+- Feature: Dynamic attachment size limit (#731)
+- Feature: Certificate watcher for external certs to reload nginx (#732)
+- Feature: Kubernetes
+- Enhancement: Use pre-defined dhparam (#322)
+- Enhancement: Disable ssl_session_tickets (#329)
+- Enhancement: max attachment size in roundcube (#338)
+- Enhancement: Use x-forwarded-proto with redirects (#347)
+- Enhancement: Added adress verification before accepting mails for delivery (#353)
+- Enhancement: Reverse proxy - Real ip header and mail-letsencrypt (#358)
+- Enhancement: Parametrize hosts (#373)
+- Enhancement: Expose ports in dockerfiles (#392)
+- Enhancement: Added webmail-imap dependency in docker-compose (#403)
+- Enhancement: Add environment variables to allow running outside of docker-compose (#429)
+- Enhancement: Add original Delivered-To header to received messages (#433)
+- Enhancement: Use HOST_ADMIN in "Forwarding authentication server" (#436, #437)
+- Enhancement: Use POD_ADDRESS_RANGE for Dovecot (#448)
+- Enhancement: Using configurable filenames for TLS certs (#468)
+- Enhancement: Don't require BootstrapCDN (GDPR-compliance) (#477)
+- Enhancement: Use dynamic client_max_body_size for webmail (#502)
+- Enhancement: New logo design (#509)
+- Enhancement: New manifests for Kubernetes (#544)
+- Enhancement: Pin Alpine image (#548, #557)
+- Enhancement: Use safer cipher in roundcube (#597)
+- Enhancement: Improve sender checks (#633)
+- Enhancement: Use PHP 7.2 for rainloop and roundcube (#606, #642)
+- Enhancement: Multi-version documentation (#664)
+- Enhancement: Contribution documentation (#700)
+- Enhancement: Move Mailu Docker network to a fixed subnet (#727)
+- Enhancement: Added regex validation for alias username (#764)
+- Enhancement: Update documentation
+- Upstream: Update Roundcube
+- Upstream: Update Rainloop
+- Bug: Rainloop fails with "domain not allowed" (#93)
+- Bug: Announces fail (#309)
+- Bug: Authentication issues with rspamd admin ui (#315)
+- Bug: front hangup on restart (#341)
+- Bug: Display the proper user quota when set to 0/infinity (#345)
+- Bug: Domain details button "Regenerate keys" when no keys are generated yet (#346)
+- Bug: Relayed Domains: access denied error (#351)
+- Bug: Do not deny HTTP access upon TLS error when the flavor is mail (#352)
+- Bug: php_zip extension missing in Roundcube webmail (#364)
+- Bug: RoundCube webmail .htaccess assumes PHP 5 (#366)
+- Bug: No quota shows "0 Bytes" in user list (#368)
+- Bug: RELAYNETS not honored when login is different from sender (#369)
+- Bug: Request Entity Too Large (#371)
+- Bug: Pass the full host to the backend (#372)
+- Bug: Can't send from an email account that has forwarding (#390)
+- Bug: SSL protocol error roundcube/imap (#411, #414)
+- Bug: Unable to send from alternative domains (#415)
+- Bug: Webadmin redirect ignores host port (#419)
+- Bug: Disable esld when signing with dkim (#435)
+- Bug: DKIM missing when using identities (#462)
+- Bug: Moving mails from Junk to Trash flags them as ham (#474)
+- Bug: Cannot set the "keep emails" for fetched accounts (#479)
+- Bug: CVE-2018-8740 (#482)
+- Bug: Hide administration header in sidebar for normal users (#505)
+- Bug: Return correct status codes from auth rate limiter failure (#513)
+- Bug: Domain edit page shows "Create" button (#523)
+- Bug: Hostname resolving in start.py should retry on failure [docker swarm]  (#555)
+- Bug: Error when trying to log in with an account without domain (#585)
+- Bug: Fix rainloop permissions (#637)
+
 v1.5.1 - 2017-11-21
 -------------------