diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 5d964dec33..ce9e85ffc4 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -12,12 +12,20 @@ Bitcoin:1AeqNAcg85APAZj9BZfAjdFCC5zesqXp2B
 Auto Name:Conversations
 Summary:Chat using the XMPP network
 Description:
-XMPP client designed with ease of use and security in mind.
+WARNING: Version 2.0.0 removed OTR support, it is recommeded to switch to OMEMO
+
+Design principles
+
+* Be as beautiful and easy to use as possible without sacrificing security or privacy
+* Rely on existing, well established protocols (XMPP)
+* Do not require a Google Account or specifically Google Cloud Messaging (GCM)
+* Require as few permissions as possible
 
 Features:
 
-* End-to-end encryption with either OTR, OpenPGP and [http://conversations.im/omemo/ OMEMO]
-* Sending and receiving images
+* End-to-end encryption with [http://conversations.im/omemo/ OMEMO] or [http://openpgp.org/about/ OpenPGP]
+* Send and receive images as well as other kind of files
+* Share your location via an external plug-in (available in F-Droid Archive)
 * Indication when your contact has read your message
 * Intuitive UI that follows Android Design guidelines
 * Pictures / Avatars for your Contacts
@@ -37,6 +45,7 @@ Noteable XEPs:
 * XEP-0280: Message Carbons
 * XEP-0313: Message Archive Management
 * XEP-0352: Client State Indication
+* XEP-0363: HTTP File Upload
 .
 
 Repo Type:git
@@ -942,33 +951,12 @@ Build:1.23.8,255
     gradle=free
     prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
 
-Build:2.0.0-beta,256
-    commit=216cf1805f5ebf7413f7239a34c1ecc914291a0d
+Build:2.0.0,261
+    commit=2.0.0
     gradle=free
     prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
 
-Build:2.0.0-beta.2,257
-    commit=fdac851d46d8db72eb844c7e2de3a574689a43fe
-    gradle=free
-    prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
-
-Build:2.0.0-beta.3,258
-    commit=854a31b27be905abc1b055b4ad1d3175b444b7f2
-    gradle=free
-    prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
-
-Build:2.0.0-beta.4,259
-    commit=ff2b1fad519c9c40c491c7ed4532e7eb6b6bc7a5
-    gradle=free
-    prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
-
-Build:2.0.0-rc.1,260
-    commit=4b5eef0ebee8a6ae3abca1159e0b9d79e56e1856
-    gradle=free
-    prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' build.gradle
-
-Archive Policy:8 versions
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[0-9.]+$
-Current Version:1.23.8
-Current Version Code:255
+Current Version:2.0.0
+Current Version Code:261