diff --git a/CHANGELOG.md b/CHANGELOG.md
index 080054259..ce4b6254a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 1.6.4
+* setting to enable white chat bubbles
+* limit OMEMO key publish attempts to work around broken PEP
+* various bug fixes
+
 ####Version 1.6.3
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index 32e13e997..8e615d8cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,8 +48,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 88
-		versionName "1.7.0-beta"
+		versionCode 89
+		versionName "1.6.4"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}