diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 79160e0db..ae0be10db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fdroid.fdroid"
     android:installLocation="auto"
-    android:versionCode="630"
-    android:versionName="0.63" >
+    android:versionCode="640"
+    android:versionName="0.64-test" >
 
     <uses-sdk
         android:minSdkVersion="5"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4d1b07e2..633e5cb7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### Upcoming release
+
+* Cache the installed apps in the database for better performance and
+  usability, but mainly to fix the sqlite crashes at startup caused by the
+  sqlite limit of parameters in queries
+
+* Improve ellipsizing and spacing in the app lists
+
+* Start translating the category lists
+
+* Fix some crashes
+
+* Translation updates
+
 ### 0.63 (2014-04-07)
 
 * Support for Network Service Discovery of local FDroid repos on Android 4.1+
diff --git a/res/values/no_trans.xml b/res/values/no_trans.xml
index 48e3ec8f0..af249254d 100644
--- a/res/values/no_trans.xml
+++ b/res/values/no_trans.xml
@@ -2,7 +2,7 @@
 <resources>
 
 	<string name="app_name">F-Droid</string>
-	<string name="version_name">0.63</string>
+	<string name="version_name">0.64-test</string>
 
 	<string name="about_sitec">https://f-droid.org</string>
 	<string name="about_mailc">team@f-droid.org</string>