diff --git a/metadata/org.ca.squawker.yml b/metadata/org.ca.squawker.yml
index 54e5cf8b1d..14c13f08f9 100644
--- a/metadata/org.ca.squawker.yml
+++ b/metadata/org.ca.squawker.yml
@@ -2110,6 +2110,96 @@ Builds:
         --no-tree-shake-icons --split-per-abi --target-platform=android-arm64 --build-name=$$VERSION$$
         --build-number=$cmdVerCode
 
+  - versionName: 3.8.5
+    versionCode: 300016681
+    commit: v3.8.5
+    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
+    srclibs:
+      - flutter@stable
+    rm:
+      - ios
+      - test
+    prebuild:
+      - version=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/release.yml)
+      - pushd $$flutter$$
+      - git checkout -f $version
+      - popd
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter packages pub get
+      - sed -i -e '/googleapis/d' .pub-cache/hosted/pub.dev/webview_cookie_manager_plus-*/android/build.gradle
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter packages pub run flutter_oss_licenses:generate.dart
+      - $$flutter$$/bin/flutter packages pub run intl_utils:generate
+      - export cmdVerCode=$(($$VERCODE$$ - 4001))
+      - echo "*** VERSION=$$VERSION$$ VERCODE=$$VERCODE$$ cmdVerCode=$cmdVerCode"
+      - $$flutter$$/bin/flutter build apk --dart-define=app.flavor=fdroid --release
+        --no-tree-shake-icons --split-per-abi --target-platform=android-x64 --build-name=$$VERSION$$
+        --build-number=$cmdVerCode
+
+  - versionName: 3.8.5
+    versionCode: 300016682
+    commit: v3.8.5
+    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+    srclibs:
+      - flutter@stable
+    rm:
+      - ios
+      - test
+    prebuild:
+      - version=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/release.yml)
+      - pushd $$flutter$$
+      - git checkout -f $version
+      - popd
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter packages pub get
+      - sed -i -e '/googleapis/d' .pub-cache/hosted/pub.dev/webview_cookie_manager_plus-*/android/build.gradle
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter packages pub run flutter_oss_licenses:generate.dart
+      - $$flutter$$/bin/flutter packages pub run intl_utils:generate
+      - export cmdVerCode=$(($$VERCODE$$ - 1002))
+      - echo "*** VERSION=$$VERSION$$ VERCODE=$$VERCODE$$ cmdVerCode=$cmdVerCode"
+      - $$flutter$$/bin/flutter build apk --dart-define=app.flavor=fdroid --release
+        --no-tree-shake-icons --split-per-abi --target-platform=android-arm --build-name=$$VERSION$$
+        --build-number=$cmdVerCode
+
+  - versionName: 3.8.5
+    versionCode: 300016683
+    commit: v3.8.5
+    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+    srclibs:
+      - flutter@stable
+    rm:
+      - ios
+      - test
+    prebuild:
+      - version=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/release.yml)
+      - pushd $$flutter$$
+      - git checkout -f $version
+      - popd
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter packages pub get
+      - sed -i -e '/googleapis/d' .pub-cache/hosted/pub.dev/webview_cookie_manager_plus-*/android/build.gradle
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter packages pub run flutter_oss_licenses:generate.dart
+      - $$flutter$$/bin/flutter packages pub run intl_utils:generate
+      - export cmdVerCode=$(($$VERCODE$$ - 2003))
+      - echo "*** VERSION=$$VERSION$$ VERCODE=$$VERCODE$$ cmdVerCode=$cmdVerCode"
+      - $$flutter$$/bin/flutter build apk --dart-define=app.flavor=fdroid --release
+        --no-tree-shake-icons --split-per-abi --target-platform=android-arm64 --build-name=$$VERSION$$
+        --build-number=$cmdVerCode
+
 AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP
 VercodeOperation:
@@ -2117,5 +2207,5 @@ VercodeOperation:
   - '%c + 2'
   - '%c + 3'
 UpdateCheckData: https://github.com/j-fbriere/squawker/releases/latest/download/version.txt|build-number=([0-9]+)|.|build-name=([.0-9]+)
-CurrentVersion: 3.8.4
-CurrentVersionCode: 300016663
+CurrentVersion: 3.8.5
+CurrentVersionCode: 300016683