diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..d6f4e234
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+Changelog
+=========
+
+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.2.1 - Unreleased
+-------------------
+
+- Bug: fix the migration script regarding wildcard aliases.
+
+  If you installed 1.2.0 and migrated already, simply run this against your
+  sqlite database:
+
+      UPDATE alias SET wildcard=0 WHERE wildcard IS NULL;
+
+v1.2.0 - 2016-08-19
+-------------------
+
+- Security: apply TLS best practices from BetterCrypto
+- Security: remove most remote assets
+- Security: add CSRF checks to all administrative actions
+- Feature: offer configuration overrides for Postfix and Dovecot
+- Feature: offer to send emails through a relay host
+
+  After migrating, make sure that you update your ``freeposte.env`` accordingly
+
+- Feature: support wildcard and catch-all aliases
+- Feature: honor the per-user spam settings
+- Enhancement: start maintaining a Changelog
+- Upstream: upgrade to Roundcube 1.2.1
+- Upstream: upgrade to Dovecot 2.2.5