diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 243bd1ff94..70d0a66b05 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -23,6 +23,9 @@ Osmand~ is the generic name for builds of Osmand not done by the developers,
 though 
 f-droid.org of course tries to be as faithful as possible to the releases. 
 x86 and MIPS modules are included in the apk.
+
+Status: We don't have the latest version of this app because it is difficult
+to build. Nightly builds by the developer are available via the Donate page.
 .
 
 #Don't use master branch
diff --git a/metadata/template b/metadata/template
index b3a9f676ed..276fcb78d3 100644
--- a/metadata/template
+++ b/metadata/template
@@ -1,3 +1,8 @@
+#See http://f-droid.org/manual for details
+#Delete fields that are not needed 
+Disabled:
+Name:
+AntiFeatures:
 Category:
 License:
 Web Site:
@@ -7,18 +12,25 @@ Donate:
 FlattrID:
 Bitcoin:
 
-Summary:This is a summary
+Summary:What the app is for
 Description:
-This
-is 
-a 
-description
+A description goes here. It should be fairly future proof, unless you intend to
+keep it updated, yet not be too short. The maximum line length is 80 chars,
+unless the basic MediaWiki markup is used.
 .
 
+Requires Root:
+
 Repo Type:
 Repo:
+#Version Names and Codes must be distinct
+Build Version:Version Name,Version Code,Commit/Tag/Revision, etc. (if necessary)
 
-Build Version:name,code,commit/tag/revision
-
+Auto Update Mode:
+#One of Tags, RepoManifest, Market or None (in that order of preference)
+#If None, describe how to obtain Current Version in a comment 
+#The other methods are automatic but check that the mechanism works
 Update Check Mode:
+Current Version:
+Current Version Code: