diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c90d092911f04747060dc3873347cdf617b0e62..3d1d6a4fc4e815a7ee769dffe69374fca3802a27 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="11"
-    android:versionName="0.2" >
+    android:versionCode="12"
+    android:versionName="0.2.1" >
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecfd13f5123cd006f1ce6f055af1c0805e26f651..116cc3077a93dfadcee4250b3af1793adeff5e23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 0.2.1
+* Various bug fixes
+* Updated Translations
+
 ####Version 0.2
 * Image file transfer
 * Better integration with OpenKeychain (PGP encryption)
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 719d769cb8d87a62b205f99290fef16c22adadea..a879324850562f10b81854bcee6d12614fb76e45 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -127,5 +127,5 @@
     <string name="keys">Schlüssel</string>
     <string name="send_presence_updates">Sende Online Status</string>
     <string name="receive_presence_updates">Empfange Online Status</string>
-    <string name="preemptively_grant">Preemptively grant subscription request</string>
+    <string name="preemptively_grant">Erlaube Statusanfrage vorab</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed855467f20d6e4649d94d51b374be52f96b18e1..26af88305ab1a43e411e0aeb9c6ecf24b2f47ee0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -130,4 +130,5 @@
     <string name="ask_for_presence_updates">Ask for presence updates</string>
     <string name="attach_choose_picture">Choose picture</string>
     <string name="attach_take_picture">Take picture</string>
+    <string name="preemptively_grant">Preemptively grant subscription request</string>
 </resources>