diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ebec6d84..4ab2d19f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,12 +1,17 @@
 Changelog
 =========
 
-
-0.2.1 - `master` _
+0.2.2 - `master` _
 ~~~~~~~~~~~~~~~~~~
 
 .. note:: This version not yet released and is under active development
 
+0.2.1 - 2015-12-14
+~~~~~~~~~~~~~~~~~~
+
+* Fixed an issue with email templates
+* Fixed bug with search not refreshing values
+* Cleaned up documentation, including working supervisor example (thanks rpicard!)
 
 0.2.0 - 2015-12-02
 ~~~~~~~~~~~~~~~~~~~
diff --git a/lemur/__about__.py b/lemur/__about__.py
index 7e2f7c16..8e1f9c0a 100644
--- a/lemur/__about__.py
+++ b/lemur/__about__.py
@@ -9,7 +9,7 @@ __title__ = "lemur"
 __summary__ = ("Certificate management and orchestration service")
 __uri__ = "https://github.com/Netflix/lemur"
 
-__version__ = "0.2.1dev"
+__version__ = "0.2.1"
 
 __author__ = "The Lemur developers"
 __email__ = "security@netflix.com"