diff --git a/changelog b/changelog
index b57b9223e..359bdf452 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,27 @@
+ietfdb (6.21.1) ietf; urgency=medium
+
+  * Fixed a problem with person alias updates where get_or_create() could 
+    find two results for one alias name because utf8_general_ci collation would 
+    match multiple different utf8 forms to the same name.
+
+  * Added an initial migration for messages.
+
+  * Added a tiny script which extracts test coverage figures from the 
+    release-coverage.json data.
+
+  * Updated maximum file-sizes for draft submissions.  Added some 
+    Trac-glue-related settings.
+
+  * Changed some instances of error strings from ascii to unicode in order 
+    to avoid problems with unicode error messages, such as the file size 
+    indications generated by django.template.defaultfilters.filesizeformat().
+
+  * Prevented people from adding ietf list-addresses to their personal 
+    accounts.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  01 Jun 2016 08:20:55 -0700
+
+
 ietfdb (6.21.0) ietf; urgency=medium
 
   **Rewritten document tracking support**