diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index ec2c9805d7..0a57d2e9f3 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -4591,6 +4591,56 @@ Build:61.0,610000
         zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*'
     ndk=r15c
 
+Build:61.0,610001
+    commit=FENNEC_61_0_RELEASE
+    timeout=28800
+    sudo=apt update && \
+        apt install -y g++ libgmp-dev libmpfr-dev libmpc-dev proguard-cli/testing libproguard-java/testing
+    output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk
+    srclibs=MozLocales@03e502fcd96a5cd64cb57a0b8cb1e39ee17b9ef1,pyenv@v1.2.4
+    prebuild=bash $$MozLocales$$/prebuild.sh && \
+        echo "ac_add_options --target=arm-linux-androideabi" >> .mozconfig && \
+        echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" >> .mozconfig && \
+        echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" >> .mozconfig && \
+        echo "mk_add_options 'export PROGUARD_JAR=/usr/share/java/proguard.jar'" >> .mozconfig && \
+        echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
+        echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
+        sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* && \
+        popd
+    build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
+        curl https://ftp.gnu.org/gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz | tar -x -J && \
+        mkdir gcc && \
+        pushd gcc-6.4.0 && \
+        ./configure --enable-languages=c,c++ --disable-multilib --prefix="$PWD/../gcc" && \
+        make -j`nproc` && \
+        make install && \
+        popd && \
+        export PATH="$PWD/gcc/bin:$PATH" && \
+        export LD_LIBRARY_PATH="$PWD/gcc/lib64" && \
+        export PYENV_ROOT="$(realpath '$$pyenv$$')" && \
+        export PATH="$PYENV_ROOT/bin:$PATH" && \
+        eval "$(pyenv init -)" && \
+        pyenv install 3.5.5 && \
+        pyenv global 3.5.5 && \
+        mkdir rust && \
+        curl https://static.rust-lang.org/dist/rust-1.25.0-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        curl https://static.rust-lang.org/dist/rust-std-1.25.0-armv7-linux-androideabi.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        PATH=$PATH:$PWD/rust/bin ./mach build && \
+        cat used-locales | xargs -I % ./mach build chrome-% && \
+        make -C obj/mobile/android/base android_apks && \
+        make -C obj package AB_CD=multi && \
+        zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*'
+    ndk=r15c
+
 Build:61.0,610010
     commit=FENNEC_61_0_RELEASE
     timeout=28800
@@ -4641,6 +4691,57 @@ Build:61.0,610010
         zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*'
     ndk=r15c
 
+Build:61.0,610011
+    commit=FENNEC_61_0_RELEASE
+    timeout=28800
+    sudo=apt update && \
+        apt install -y g++ libgmp-dev libmpfr-dev libmpc-dev proguard-cli/testing libproguard-java/testing
+    output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk
+    srclibs=MozLocales@03e502fcd96a5cd64cb57a0b8cb1e39ee17b9ef1,pyenv@v1.2.4
+    prebuild=bash $$MozLocales$$/prebuild.sh && \
+        echo "ac_add_options --target=i386-linux-androideabi" >> .mozconfig && \
+        echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" >> .mozconfig && \
+        echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" >> .mozconfig && \
+        echo "mk_add_options 'export PROGUARD_JAR=/usr/share/java/proguard.jar'" >> .mozconfig && \
+        echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
+        echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
+        sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* && \
+        popd
+    build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
+        curl https://ftp.gnu.org/gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz | tar -x -J && \
+        mkdir gcc && \
+        pushd gcc-6.4.0 && \
+        ./configure --enable-languages=c,c++ --disable-multilib --prefix="$PWD/../gcc" && \
+        make -j`nproc` && \
+        make install && \
+        popd && \
+        export PATH="$PWD/gcc/bin:$PATH" && \
+        export LD_LIBRARY_PATH="$PWD/gcc/lib64" && \
+        export PYENV_ROOT="$(realpath '$$pyenv$$')" && \
+        export PATH="$PYENV_ROOT/bin:$PATH" && \
+        eval "$(pyenv init -)" && \
+        pyenv install 3.5.5 && \
+        pyenv global 3.5.5 && \
+        mkdir rust && \
+        curl https://static.rust-lang.org/dist/rust-1.25.0-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        curl https://static.rust-lang.org/dist/rust-std-1.25.0-i686-linux-android.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        export PATH="$PATH:$PWD/rust/bin" && \
+        ./mach build && \
+        cat used-locales | xargs -I % ./mach build chrome-% && \
+        make -C obj/mobile/android/base android_apks && \
+        make -C obj package AB_CD=multi && \
+        zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*'
+    ndk=r15c
+
 Maintainer Notes:
 
 Updating/Versioning:
@@ -4665,4 +4766,4 @@ Archive Policy:6 versions
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:61.0
-Current Version Code:610010
+Current Version Code:610011