diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index d3fba5790f..dd4dd36526 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -11,19 +11,6 @@ Changelog:https://www.mozilla.org/en-US/firefox/releases
 Name:Firefox
 Summary:Web browser
 Description:
-Mobile version of the Firefox web browser. Uses the Gecko layout engine to
-render web pages, which
-implements current and anticipated web standards. Features include: bookmark
-sync, custom search engines,
-support for addons and the ability to enable or disable the search suggestions.
-
-Anti-features: Non-free Addons: The license of the addons/modules on
-addons.mozilla.org may be seen in the version notes of the addon and often the
-license is Custom or other non-free.
-However there is no such license info for most apps from the marketplace.
-Tracking: Stats are sent back regularly to the developers, but that can
-be disabled via settings.
-
 '''DEPRECATION NOTICE'''
 
 Note that this package is planned to be dropped from the F-Droid repo. Please
@@ -34,6 +21,19 @@ consider using one of the following options for continued update support:
 * [[de.marmaro.krt.ffupdater]] - external updater for Firefox
 * [https://www.mozilla.org/en-US/firefox/channel/#developer Firefox Aurora/Developer Edition] - bleeding edge Firefox with automatic updates
 * [[info.guardianproject.orfox]] - based on the TOR Browser bundle of Firefox, get it from the [https://dev.guardianproject.info/debug/info.guardianproject.orfox/fdroid/repo Guardian Project Alpha Channel]
+
+'''Description'''
+
+Mobile version of the Firefox web browser. Uses the Gecko layout engine to
+render web pages, which implements current and anticipated web standards.
+Features include: bookmark sync, custom search engines, support for addons
+and the ability to enable or disable the search suggestions.
+
+'''Anti-Features'''
+
+* Non-free Addons: The license of the addons may be seen in the version notes, but often are non-free. The marketplace has no license information on most apps.
+* Tracking: Stats are sent back regularly to the developers, but that can be disabled via settings. Also some versions contain "Adjust" tracking software.
+* UpstreamNonFree: Contains proprietary software, e.g. play-services.
 .
 
 Maintainer Notes: