diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml
index 4a14402c75..4e3c91e103 100644
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@@ -241,7 +241,25 @@ Builds:
       - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar
     ndk: r21e
 
+  - versionName: 1.8.6-t28a8f9c90-g04890797712
+    versionCode: 42
+    commit: v1.8.6-t28a8f9c90-g04890797712
+    subdir: android
+    gradle:
+      - fdroid
+    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
+        > /dev/null
+    build:
+      - curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
+      - echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz"
+        | sha256sum -c -
+      - tar xzf go.tar.gz
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar
+    ndk: r21e
+
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
-CurrentVersion: 1.8.6-t28a8f9c90-gff16a75a65c
-CurrentVersionCode: 41
+CurrentVersion: 1.8.6-t28a8f9c90-g04890797712
+CurrentVersionCode: 42