diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8206260..db73e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.12.2]
+
+**Fixes**:
+- [#439](https://github.com/alecthomas/voluptuous/issues/439): Revert Breaking Maybe change in 0.12.1
+- [#447](https://github.com/alecthomas/voluptuous/issues/447): Fix Email Regex to not match on extra characters
+
 ## [0.12.1]
 
 **Changes**:
@@ -174,4 +180,4 @@ translation to python 2 issue fixed.
 
 ## 0.9.3 (2016-08-03)
 
-Changelog not kept for 0.9.3 and earlier releases.
\ No newline at end of file
+Changelog not kept for 0.9.3 and earlier releases.
diff --git a/voluptuous/__init__.py b/voluptuous/__init__.py
index 4d09fe6..4d68fdd 100644
--- a/voluptuous/__init__.py
+++ b/voluptuous/__init__.py
@@ -5,5 +5,5 @@
 from voluptuous.util import *
 from voluptuous.error import *
 
-__version__ = '0.12.1'
+__version__ = '0.12.2'
 __author__ = 'alecthomas'