diff --git a/CHANGES.md b/CHANGES.md
index 416f7fb..ecbb928 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# 1.2.1 (June 1, 2016)
+
+Bugfixes
+* Fix regression in MessageSet decoding wrt PartialMessages (#716)
+* Catch response decode errors and log details (#715)
+* Fix Legacy support url (#712 - JonasGroeger)
+* Update sphinx docs re 0.10 broker support
+
+
 # 1.2.0 (May 24, 2016)
 
 This release officially adds support for Kafka 0.10
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6d895ee..3d4f606 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+1.2.1 (June 1, 2016)
+####################
+
+Bugfixes
+--------
+* Fix regression in MessageSet decoding wrt PartialMessages (#716)
+* Catch response decode errors and log details (#715)
+* Fix Legacy support url (#712 - JonasGroeger)
+* Update sphinx docs re 0.10 broker support
+
+
 1.2.0 (May 24, 2016)
 ####################
 
diff --git a/kafka/version.py b/kafka/version.py
index f231a4a..3f262a6 100644
--- a/kafka/version.py
+++ b/kafka/version.py
@@ -1 +1 @@
-__version__ = '1.2.1.dev'
+__version__ = '1.2.1'