diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index 1f537deea5..543761dc55 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -2126,17 +2126,16 @@ Build:40.0,400010
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
-# testing, requires skip-scan, doesnt build
-Build:43.0.1,430001
-    disable=compilation issues
-    commit=FENNEC_43_0_1_RELEASE
+Build:44.0,440000
+    commit=FENNEC_44_0_RELEASE
     output=fdroid/fennec-unsigned.apk
-    srclibs=MozLocales@dd882b1c1881b9f3c43a23b0a9412a49d8c53505
+    srclibs=MozLocales@be553c20
     prebuild=mkdir fdroid && \
-        fxarch=arm-linux-androideabi && \
+        fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
         l10ndir=`readlink -f $$MozLocales$$` && \
-        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
-        echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
+        bash $$MozLocales$$/prebuild.sh && \
+        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 --target=${fxarch}" >> .mozconfig && \
         echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
@@ -2144,14 +2143,47 @@ Build:43.0.1,430001
         echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
         echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig && \
         echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .mozconfig && \
-        sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
-        sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
         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 && \
         popd
-    build=./mach build && \
+    scanignore=mobile/android/base/javaaddons/JavaAddonManager.java,mobile/android/base/javaaddons/JavaAddonManagerV1.java
+    build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
+        ./mach build && \
+        fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
+        pushd obj-${fxarch}/mobile/android/locales && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        popd && \
+        ./mach package && \
+        mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
+        zip -d fdroid/fennec-unsigned.apk "META-INF*"
+
+Build:44.0,440010
+    commit=FENNEC_44_0_RELEASE
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@be553c20
+    prebuild=mkdir fdroid && \
+        fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
+        l10ndir=`readlink -f $$MozLocales$$` && \
+        bash $$MozLocales$$/prebuild.sh && \
+        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 --target=${fxarch}" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
+        echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
+        echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig && \
+        echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .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 && \
+        popd
+    scanignore=mobile/android/base/javaaddons/JavaAddonManager.java,mobile/android/base/javaaddons/JavaAddonManagerV1.java
+    build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
+        ./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
         for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
@@ -2162,19 +2194,6 @@ Build:43.0.1,430001
 
 Maintainer Notes:
 
-find . -type f -name moz.build -print0 | xargs -0 sed -i -e "\$aFAIL_ON_WARNINGS = False" && \
-
-find . -type f -name moz.build -print0 | xargs -0 sed -i -e "\$aALLOW_COMPILER_WARNINGS = True" && \
--Werror: https://hg.mozilla.org/mozilla-central/rev/c646a88160d7
-http://gregoryszorc.com/blog/2013/02/28/moz.build-files-and-the-firefox-build-system/
-
-TODO:
- * clean up
- * MOZ_CRASHREPORTER
- * MOZ_SAFE_BROWSING
- * MOZ_HEALTHREPORTER => only UI
- * https://hg.mozilla.org/mozilla-central/annotate/tip/mobile/android/config/mozconfigs/common
-
 Issues:
  * Permissions:
     * Updater? (look at MOZ(ILLA)_RELEASE, MOZ_UPDATER, MOZ_UPDATE_CHANNEL etc. )