diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bc5ba2c82..4bf659e938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Braintree Android SDK Release Notes
 
+## 2.3.12
+
+* Improve PayPal address validations
+* Work around `NullPointerException` in `BraintreeFragment#newInstance` (fixes [#125](https://github.com/braintree/braintree_android/issues/125))
+* Document supported locales for PayPal
+* Fix rare `NullPointerException` ([#128](https://github.com/braintree/braintree_android/pull/128))
+
+## 2.3.12
+
+* Improve PayPal address validations
+* Work around `NullPointerException` in `BraintreeFragment#newInstance` (fixes [#125](https://github.com/braintree/braintree_android/issues/125))
+* Document supported locales for PayPal
+* Fix rare `NullPointerException` ([#128](https://github.com/braintree/braintree_android/pull/128))
+
 ## 2.3.11
 
 * Fix ProGuard rules (fixes [#124](https://github.com/braintree/braintree_android/issues/124))
diff --git a/build.gradle b/build.gradle
index 0fb495bef0..2a0b638bda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,13 +77,13 @@ allprojects {
         sign configurations.archives
     }
 
-    version = '2.3.11-SNAPSHOT'
+    version = '2.3.12'
     ext {
         compileSdkVersion = 25
         buildToolsVersion = '25.0.0'
         minSdkVersion = 15
         targetSdkVersion = 25
-        versionCode = 56
+        versionCode = 58
         versionName = version
     }
 }