diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7f564bc8ccbdc83d5d80547a432343e7f68406c..ce0bd52f00893822928c80b086beca3cbb29881e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="9"
-    android:versionName="0.1.3" >
+    android:versionCode="10"
+    android:versionName="0.2-alpha" >
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e352af5952a70188c170efe3ce3d60b665de7ad0..fbb9576e9f0b6225e37b0f8ee406daeaf251c592 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ###Changelog
 
+####Version 0.2
+* Image file transfer
+* Better integration with OpenKeychain (PGP encryption)
+* Nicer conversation tiles for conferences
+* A lot of bug fixes and code clean up
+
 ####Version 0.1.3
 * Switched to minidns library to resolve SRV records
 * Faster DNS in some cases