diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba8c515a1..f28f2c24d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Change Log
 
+## [3.1.4] - 2016-04-04
+### Changed
+- Sent images are now saved into Pictures/Kontalk/Sent (#539)
+- Make personal key information copyable (#651)
+
+### Fixed
+- Fix outgoing images that could not be opened in gallery (#539)
+- Fix table issue with text entry (#583)
+- Fix availablea/away state (#637)
+- Fix scroll-to-result when reloading in a search (#641)
+- Fix possible crash during registration (#643)
+- Fix presence handling (#644)
+- Mark as read only notified conversation (#648)
+- Correctly detect image rotation (#649)
+- Fix truncated text in RTL languages (#653)
+- Fix notification action not working (#660)
+- Fix contact picture in Android 6 (#664)
+
 ## [3.1.3] - 2016-01-31
 ### Changed
 - Search bar with new material search widget (#596)
diff --git a/app/build.gradle b/app/build.gradle
index 963a067fe..d1bfafcd8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,8 +33,8 @@ android {
 
     defaultConfig {
         applicationId "org.kontalk"
-        versionCode 99
-        versionName "3.1.4-preview"
+        versionCode 100
+        versionName "3.1.4"
         targetSdkVersion 22
         minSdkVersion 9
         resConfigs "en", "de", "fr", "it", "es", "ca", "cs", "el", "fa", "gl", "ja", "nl", "pt", "ru", "sr", "zh-rCN", "ar"