diff --git a/metadata/com.aefyr.sai.fdroid.yml b/metadata/com.aefyr.sai.fdroid.yml
index 7692a1e645..78533f1f54 100644
--- a/metadata/com.aefyr.sai.fdroid.yml
+++ b/metadata/com.aefyr.sai.fdroid.yml
@@ -107,29 +107,26 @@ Builds:
       - popd
       - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
 
-  - versionName: '3.7'
-    versionCode: 48
-    disable: unknown maven
-    commit: '3.7'
+  - versionName: '3.9'
+    versionCode: 51
+    commit: '3.9'
     subdir: app
     patch:
       - build.patch
     gradle:
       - fdroid
     srclibs:
-      - aefyr-android-filepicker@d7d923f8f58f89c732f31059d74952d7dcefb288
+      - aefyr-android-filepicker@56c1921965c680a3b0a62c8f8f6467c92ee8ee48
     rm:
       - app/libs/filepicker-release.aar
-    prebuild: sed -i -e '/io.fabric/d' build.gradle
+    prebuild: sed -i -e '/io.fabric/d' -e '/google-services/d' build.gradle
     build:
       - pushd $$aefyr-android-filepicker$$
       - gradle assembleRelease
       - popd
       - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
 
-AutoUpdateMode: None
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: '3.8'
-CurrentVersionCode: 50
-
-NoSourceSince: '2.5'
+CurrentVersion: '3.9'
+CurrentVersionCode: 51
diff --git a/metadata/com.aefyr.sai.fdroid/build.patch b/metadata/com.aefyr.sai.fdroid/build.patch
index a43b4de13d..3ba748d298 100644
--- a/metadata/com.aefyr.sai.fdroid/build.patch
+++ b/metadata/com.aefyr.sai.fdroid/build.patch
@@ -1,6 +1,6 @@
 --- a/build.gradle
 +++ b/build.gradle
-@@ -8,14 +8,10 @@
+@@ -8,14 +8,9 @@
          flatDir {
              dirs 'libs'
          }
@@ -9,13 +9,13 @@
 -        }
      }
      dependencies {
-         classpath 'com.google.gms:google-services:4.3.3'
-         classpath 'com.android.tools.build:gradle:3.5.3'
+-        classpath 'com.google.gms:google-services:4.3.3'
+         classpath 'com.android.tools.build:gradle:3.6.1'
 -        classpath 'io.fabric.tools:gradle:1.31.0'
  
          // NOTE: Do not place your application dependencies here; they belong
          // in the individual module build.gradle files
-@@ -26,12 +22,6 @@
+@@ -26,12 +21,6 @@
      repositories {
          google()
          jcenter()