diff --git a/metadata/org.kontalk.txt b/metadata/org.kontalk.txt
index 934f47f771..70ba1ee18b 100644
--- a/metadata/org.kontalk.txt
+++ b/metadata/org.kontalk.txt
@@ -8,35 +8,6 @@ Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VU57
 Bitcoin:14vipppSvCG7VdvoYmbhKZ8DbTfv9U1QfS
 
 Auto Name:Kontalk
-Summary:Community-driven messaging
-Description:
-'''Follow @kontalknet on Twitter or identi.ca to keep up to date with the latest
-changes and on service status!'''
-
-Kontalk is a secure instant messenger, allowing you to send and receive text,
-image and voice messages (other file types coming soon) to and from other
-Kontalk users completely free of charge (*).
-
-* '''Your phone number is your ID.''' No usernames or passwords
-* '''It automatically finds other Kontalk users''' by looking at your address book, making it even easier to start chatting on Kontalk with your friends
-* '''End-to-end encryption''' ensures safe and private conversations, so that only you and the person you are talking to can read them
-* Your and all phone numbers used on the network are irreversibly encrypted
-* It supports multiple devices, making it very easy to start chatting on your phone and continue the conversation on your tablet
-* Based on open standards: XMPP and OpenPGP
-
-The network relies on community donations to keep the infrastructure running, so
-if you can, please donate on [http://kontalk.net/ kontalk.net]. Even small
-donations matter.
-
-You can find all permissions used by the app explained at
-[https://github.com/kontalk/androidclient/wiki/Android-client-permissions this
-page].
-
-This version has been stripped of all Google components, meaning no support for
-push notifications.
-
-(*) Carrier fees for Internet traffic may apply
-.
 
 Repo Type:git
 Repo:https://github.com/kontalk/androidclient.git
@@ -540,6 +511,9 @@ Build:4.0.3,226
 
 Maintainer Notes:
 Dont add beta/preview builds until AUM and UCI are fixed.
+
+Summary and Description have been moved to the new localizable text files:
+https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
 .
 
 Archive Policy:10 versions
diff --git a/metadata/org.kontalk/en-US/description.txt b/metadata/org.kontalk/en-US/description.txt
new file mode 100644
index 0000000000..8a7650f521
--- /dev/null
+++ b/metadata/org.kontalk/en-US/description.txt
@@ -0,0 +1,26 @@
+'''Follow @kontalknet on Twitter or identi.ca to keep up to date with the latest
+changes and on service status!'''
+
+Kontalk is a secure instant messenger, allowing you to send and receive text,
+image and voice messages (other file types coming soon) to and from other
+Kontalk users completely free of charge (*).
+
+* '''Your phone number is your ID.''' No usernames or passwords
+* '''It automatically finds other Kontalk users''' by looking at your address book, making it even easier to start chatting on Kontalk with your friends
+* '''End-to-end encryption''' ensures safe and private conversations, so that only you and the person you are talking to can read them
+* Your and all phone numbers used on the network are irreversibly encrypted
+* It supports multiple devices, making it very easy to start chatting on your phone and continue the conversation on your tablet
+* Based on open standards: XMPP and OpenPGP
+
+The network relies on community donations to keep the infrastructure running, so
+if you can, please donate on [http://kontalk.net/ kontalk.net]. Even small
+donations matter.
+
+You can find all permissions used by the app explained at
+[https://github.com/kontalk/androidclient/wiki/Android-client-permissions this
+page].
+
+This version has been stripped of all Google components, meaning no support for
+push notifications.
+
+(*) Carrier fees for Internet traffic may apply
diff --git a/metadata/org.kontalk/en-US/summary.txt b/metadata/org.kontalk/en-US/summary.txt
new file mode 100644
index 0000000000..cc163c1c9d
--- /dev/null
+++ b/metadata/org.kontalk/en-US/summary.txt
@@ -0,0 +1 @@
+Community-driven messaging