diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml
index eeddf1d80d..daec6ea7a1 100644
--- a/metadata/network.loki.messenger.fdroid.yml
+++ b/metadata/network.loki.messenger.fdroid.yml
@@ -498,10 +498,48 @@ Builds:
         -e '/IOUtils/d' linkpreview/LinkPreviewRepository.java
     ndk: r25
 
+  - versionName: 1.16.4
+    versionCode: 3315
+    commit: 4e38b75f57147668eac6629bf19d398927de69b1
+    subdir: app
+    gradle:
+      - play
+    srclibs:
+      - session-lazysodium-android@883c0aada48d4211d5fca30d025a90f9b2919edf
+    rm:
+      - app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt
+      - app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt
+      - app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
+      - liblazysodium
+    prebuild:
+      - ln -s $$session-lazysodium-android$$/app ../liblazysodium
+      - ln -s $$session-lazysodium-android$$/session-lazysodium-java ..
+      - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' ../build.gradle
+      - sed -i -e '/gms/d' -e '/firebase-messaging/,/^    }/d' -e '/enable true/d'
+        -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/android-database-sqlcipher/s/org.signal/net.zetetic/'
+        -e '/android-database-sqlcipher/s/3.5.9-S3/4.0.0/' -e '/defaultConfig/a applicationId
+        "network.loki.messenger.fdroid"' build.gradle
+      - sed -i -z -E -e 's/<[^<]+pref_key_use_fcm[^>]+>//' src/main/res/xml/preferences_notifications.xml
+      - sed -i -E -e '/app_name/s/>(.+)</>\1 F-Droid</' src/main/res/*/strings.xml
+      - for uri in $(sed -n -E 's/android:authorities="network.loki.(.*)"/\1/p' src/main/AndroidManifest.xml);
+        do find src/main/java/org/thoughtcrime/securesms -type f -exec sed -i -e "s/network.loki.$uri/network.loki.fdroid.$uri/"
+        {} +; done
+      - sed -i -e '/READ_PHONE_STATE/d' -e '/c2dm/d' -e 's/ACCESS_SESSION_SECRETS/fdroid.ACCESS_SESSION_SECRETS/'
+        -e '/android:authorities/s/network.loki/network.loki.fdroid/' src/main/AndroidManifest.xml
+      - cd src/main/java/org/thoughtcrime/securesms
+      - sed -i -e '/fun toggleFCM()/,/^    }/d' -e 's/toggleFCM/toggleBackgroundPolling/'
+        onboarding/PNModeActivity.kt
+      - sed -i -e '/void registerForFCMIfNeeded/,/^    }/s/^        .*//' -e '/FcmUtils/d'
+        -e '/LokiPushNotificationManager/d' ApplicationContext.java
+      - sed -i -e '/pref_key_use_fcm/,/^      });/d' preferences/NotificationsPreferenceFragment.java
+      - sed -i -e 's/IOUtils.readInputStreamFully(bodyStream);/new byte[bodyStream.available()];bodyStream.read(data);/'
+        -e '/IOUtils/d' linkpreview/LinkPreviewRepository.java
+    ndk: r25
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 VercodeOperation:
   - 10*%c+5
 UpdateCheckData: app/build.gradle|canonicalVersionCode\s=\s(\d+)|.|canonicalVersionName\s=\s"([\d.]+)"
-CurrentVersion: 1.16.3
-CurrentVersionCode: 3235
+CurrentVersion: 1.16.4
+CurrentVersionCode: 3315