diff --git a/src/build-scripts/build-apk.sh b/src/build-scripts/build-apk.sh
index 2f29a0bc..2b580f88 100755
--- a/src/build-scripts/build-apk.sh
+++ b/src/build-scripts/build-apk.sh
@@ -3,6 +3,12 @@ set -e
 
 pushd ../keepass2android
 
-xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+else
+	xabuild keepass2android.csproj /p:AndroidSdkDirectory=$ANDROID_HOME /t:SignAndroidPackage "$@"
+fi
 
 popd
diff --git a/src/build-scripts/build-xamarin.sh b/src/build-scripts/build-xamarin.sh
index a9ca3c16..075973f3 100755
--- a/src/build-scripts/build-xamarin.sh
+++ b/src/build-scripts/build-xamarin.sh
@@ -20,6 +20,12 @@ popd
 
 # call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 
-xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+else
+	xabuild KeePass.sln /target:keepass2android /p:AndroidSdkDirectory=$ANDROID_HOME /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+fi
 
 popd
diff --git a/src/build.readme.md b/src/build.readme.md
index 0ef07d7a..cbf0c0ec 100644
--- a/src/build.readme.md
+++ b/src/build.readme.md
@@ -43,6 +43,7 @@ build-java.bat will call gradlew for several Java modules. build-xamarin.bat wil
 - Install [libzip](https://libzip.org/) for your distribution.
   - Note: Xamarin seems to require `libzip4`, yet most distributions only ships `libzip5`. As a dirty workaround, it's possible to symlink `libzip.so.5` to `libzip.so.4`. Luckily, it appears to be working.
   - `sudo ln -s /usr/lib/libzip.so.5 /usr/lib/libzip.so.4`
+  - or `sudo ln -s /usr/lib64/libzip.so.5 /usr/lib/libzip.so.4`
 - Install NuGet dependencies:
   - `cd src/ && nuget restore KeePass.sln`
 - Build:
diff --git a/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs b/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
index 6777b31b..9165dfc5 100644
--- a/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
+++ b/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
@@ -3,7 +3,7 @@ using Android.Content;
 
 namespace keepass2android.services.AutofillBase
 {
-    
+
     internal class Kp2aDigitalAssetLinksDataSource
     {
         private static Kp2aDigitalAssetLinksDataSource instance;
@@ -30,7 +30,8 @@ namespace keepass2android.services.AutofillBase
 
         static readonly HashSet<string> _trustedBrowsers = new HashSet<string>
         {
-            "org.mozilla.firefox","org.mozilla.firefox_beta","org.mozilla.fenix","org.mozilla.klar","org.mozilla.focus",
+            "org.mozilla.firefox","org.mozilla.firefox_beta","org.mozilla.klar","org.mozilla.focus",
+            "org.mozilla.fenix","org.mozilla.fenix.nightly","org.mozilla.reference.browser",
             "com.android.browser","com.android.chrome","com.chrome.beta","com.chrome.dev","com.chrome.canary",
             "com.google.android.apps.chrome","com.google.android.apps.chrome_dev",
             "com.opera.browser","com.opera.browser.beta","com.opera.mini.native",