diff --git a/metadata/org.servalproject.txt b/metadata/org.servalproject.txt
index c1d6932d09..11c7132803 100644
--- a/metadata/org.servalproject.txt
+++ b/metadata/org.servalproject.txt
@@ -1,39 +1,47 @@
 Category:Phone & SMS
-License:GPLv3
-Web Site:http://developer.servalproject.org/dokuwiki/doku.php
+License:GPLv2/GPLv3
+Web Site:http://www.servalproject.org
 Source Code:https://github.com/servalproject/batphone
 Issue Tracker:https://github.com/servalproject/batphone/issues
+Donate:http://www.servalproject.org/donations
 
-Summary:Robust communication using wifi
+Summary:Peer to peer communications
 Description:
+N.B This is experimental software and currently requires root access: please see the warnings in the README
+of the source code. It may not work as advertised; it may lose or alter messages and files that it carries; 
+it may consume a lot of space, speed and battery; and it may crash unexpectedly.
+To avail of the maps feature a separate app has to be installed which isn't in the f-droid.org repo yet.
+
 Mobile communications are useful, but depend on infrastructure that can be damaged, overwhelmed, 
-or even absent. This app assumes zero infrastructure: the phones talk to each other, 
-relaying calls, and resolving numbers for each other. A cellular commons using the unique 
-Serval Mesh telephony software that allows you to use your existing phone number.
+or even absent. This app assumes zero infrastructure. The phones talk to each other using WiFi; 
+relaying calls and messages and figuring out how to resolve numbers. In other words, it lets your phone 
+communicate with other Android phones running Serval Mesh within WiFi range.
 
 * Can be carried and activated in seconds by those who need it when it is needed
 * Carrier independent
 * Can be distributed during an emergency from only one phone 
 * Distributed nature makes network resilient
 
-Ideal for remote, rural & impoverished communities, and disaster/emergency situations, and the 
-services that support them, the software is making the best of one of the most ubiquitous 
-of devices - the mobile phone. Turn your phone into a true communications device - anytime, anywhere.
+Ideal for remote, rural and impoverished communities; disaster/emergency situations, and the 
+services that support them: the software is making the best of one of the most ubiquitous 
+of devices - the mobile phone. Turn your phone into a true communications device; anytime, anywhere.
 
-This is experimental software and currently requires root access. To avail of the maps feature
-a separate app has to be installed which isn't in the repo yet.
+Requires Root: Ideally. Basic Android still doesn't allow WiFi in AdHoc mode, so the app will enable it
+if you allow it root. It can function without root permission, but will be limited to using an 
+existing WiFi home network or hot spot, and may not work altogether.
+
+The Java/XML part is distributable under the GNU GPLv3 while the serval-dna project is GPLv2.
 .
 
-Requires Root:Yes
-
+#Requires Root:No
 Repo Type:git
 Repo:https://github.com/servalproject/batphone.git
 
-#May need to add version code to manifest.
-Build Version:1.0,1300,!wait for next release 1.0,buildjni=yes,submodules=yes,init=git checkout release
+#Releases are in master branch, beta in development; version codes are mysterious
+Build Version:0.90-beta,1877,!needs checking 0.90-beta,buildjni=no,submodules=yes,prebuild=\
+sed -i 's/android:versionName="\@string\/version"/android:versionName="0.90-beta"/g' AndroidManifest.xml
 
 Auto Update Mode:None
-#Tags are incomprehensible 
 Update Check Mode:Market
 Current Version:0.08
 Current Version Code:1214