diff --git a/CHANGELOG.md b/CHANGELOG.md
index 087e36bbe..65f38107c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [3.1.8] - 2016-04-23
+### Changed
+- Show message when search returns an empty result set (#647)
+- New material icons (#689)
+
+### Fixed
+- Prevent app hanging during registration (#690)
+
 ## [3.1.7] - 2016-04-18
 ### Changed
 - Update to latest emojis
diff --git a/app/build.gradle b/app/build.gradle
index 08fb6148d..70ac7b6ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
 
     defaultConfig {
         applicationId "org.kontalk"
-        versionCode 113
-        versionName "3.1.8-preview"
+        versionCode 114
+        versionName "3.1.8"
         targetSdkVersion 22
         minSdkVersion 9
         resConfigs "en", "de", "fr", "it", "es", "ca", "cs", "el", "fa", "gl", "ja", "nl", "pt", "ru", "sr", "zh-rCN", "ar"