diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index d3ca7776f2..6b45b7e264 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -14,22 +14,11 @@ Description:
 Browser using the Gecko layout engine to render web pages, which implements
 current and anticipated web standards. This is a developer build based on the
 latest [[org.mozilla.firefox]] release. It's focused on removing any proprietary
-binaries used in the official builds.
-
-There might still be binaries left. The app (or some of the builds) might get
-removed or re-pushed at anytime:
+binaries used in the official builds. There might still be binaries left and the
+app (or some of the builds) might get removed or re-pushed at anytime:
 
 DO NOT INSTALL unless you know what you are doing!
 
-Currently following features are being stripped/added at build time:
-
-* Removed: Tests
-* Removed: Crashreporter
-* Removed: Mediastreaming (requires non-free library: play-services)
-* Removed: Updater
-* Removed: [https://wiki.mozilla.org/Media/EME EME]/DRM
-* Added: MultiLocales
-
 For further information, please look at the
 [https://gitlab.com/fdroid/fdroiddata/tree/master/metadata/org.mozilla.fennec_fdroid.txt
 build recipe].
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index 64b28d445a..4c67a0f47b 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -16,7 +16,7 @@ Note that this package will soon be dropped from the F-Droid repo. Please
 consider using one of the following options for continued update support:
 
 * Manually download latest version from [https://download.mozilla.org/?product=fennec-latest&os=android&lang=multi Mozilla]
-* [https://www.mozilla.org/en-US/firefox/channel/#developer Firefox Aurora/Developer Edition] - bleeding edge Firefox with automatic updates
+* [https://www.mozilla.org/en-US/firefox/channel/android/#nightly Firefox Nightly] - bleeding edge Firefox with automatic updates
 
 We urged Mozilla to enable auto-updates for release builds in 2015 -- see
 [https://bugzilla.mozilla.org/show_bug.cgi?id=1192279 bugzilla] -- but the issue