diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 973fc4c8..ebec6d84 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,12 +1,29 @@
 Changelog
 =========
 
-0.2.0 - `master` _
-~~~~~~~~~~~~~~~~~~~
+
+0.2.1 - `master` _
+~~~~~~~~~~~~~~~~~~
 
 .. note:: This version not yet released and is under active development
 
 
+0.2.0 - 2015-12-02
+~~~~~~~~~~~~~~~~~~~
+
+* Closed #120 - Error messages not displaying long enough
+* Closed #121 - Certificate create form should not be valid until a Certificate Authority object is available
+* Closed #122 - Certificate API should allow for the specification of preceding certificates
+    You can now target a certificate(s) for replacement. When specified the replaced certificate will be marked as
+    'inactive'. This means that there will be no notifications for that certificate.
+* Closed #139 - SubCA autogenerated descriptions for their certs are incorrect
+* Closed #140 - Permalink does not change with filtering
+* Closed #144 - Should be able to search certificates by domains covered, included wildcards
+* Closed #165 - Cleaned up expiration notification template
+* Closed #160 - Cleaned up quickstart documentation (thanks forkd!)
+* Closed #144 - Now able to search by all domains in a given certificate, not just by common name
+
+
 0.1.5 - 2015-10-26
 ~~~~~~~~~~~~~~~~~~~