diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 033cb2ff40..735cfe9dc5 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -16,6 +16,7 @@ Repo: https://github.com/foobnix/LibreraReader.git
 Builds:
   - versionName: 8.0.38-fdroid
     versionCode: 1098
+    disable: junrar
     commit: 8.0.39
     subdir: app/
     sudo:
@@ -45,6 +46,7 @@ Builds:
 
   - versionName: 8.1.191-fdroid
     versionCode: 1930
+    disable: junrar
     commit: 8.1.191
     subdir: app/
     sudo:
@@ -76,6 +78,7 @@ Builds:
 
   - versionName: 8.1.275-fdroid
     versionCode: 3136
+    disable: junrar
     commit: 8.1.275
     subdir: app/
     sudo:
@@ -106,6 +109,7 @@ Builds:
 
   - versionName: 8.1.305-fdroid
     versionCode: 3270
+    disable: junrar
     commit: 8.1.305
     subdir: app/
     sudo:
@@ -136,6 +140,7 @@ Builds:
 
   - versionName: 8.2.11-fdroid
     versionCode: 3420
+    disable: junrar
     commit: 8.2.11
     subdir: app/
     sudo:
@@ -166,6 +171,7 @@ Builds:
 
   - versionName: 8.2.29-fdroid
     versionCode: 3484
+    disable: junrar
     commit: 8.2.29
     subdir: app/
     sudo:
@@ -196,6 +202,7 @@ Builds:
 
   - versionName: 8.2.43-fdroid
     versionCode: 3536
+    disable: junrar
     commit: 8.2.43
     subdir: app/
     sudo:
@@ -224,6 +231,7 @@ Builds:
 
   - versionName: 8.3.19-fdroid
     versionCode: 3636
+    disable: junrar
     commit: 8.3.19
     subdir: app/
     sudo:
@@ -252,6 +260,7 @@ Builds:
 
   - versionName: 8.3.22-fdroid
     versionCode: 3660
+    disable: junrar
     commit: 8.3.22
     subdir: app/
     sudo:
@@ -280,6 +289,7 @@ Builds:
 
   - versionName: 8.3.28-fdroid
     versionCode: 3684
+    disable: junrar
     commit: 8.3.28
     subdir: app/
     sudo:
@@ -308,6 +318,7 @@ Builds:
 
   - versionName: 8.3.39-fdroid
     versionCode: 3728
+    disable: junrar
     commit: 8.3.39
     subdir: app/
     sudo:
@@ -334,6 +345,7 @@ Builds:
 
   - versionName: 8.3.45-fdroid
     versionCode: 3772
+    disable: junrar
     commit: 8.3.45
     subdir: app/
     sudo:
@@ -360,6 +372,7 @@ Builds:
 
   - versionName: 8.3.69-fdroid
     versionCode: 3869
+    disable: junrar
     commit: 8.3.69
     subdir: app/
     sudo:
@@ -386,6 +399,7 @@ Builds:
 
   - versionName: 8.3.75-fdroid
     versionCode: 3875
+    disable: junrar
     commit: 8.3.75
     subdir: app/
     sudo:
@@ -416,6 +430,7 @@ Builds:
 
   - versionName: 8.3.83-fdroid
     versionCode: 3885
+    disable: junrar
     commit: 8.3.83
     subdir: app/
     sudo:
@@ -446,6 +461,7 @@ Builds:
 
   - versionName: 8.3.100-fdroid
     versionCode: 4000
+    disable: junrar
     commit: 8.3.100
     subdir: app/
     sudo:
@@ -476,6 +492,7 @@ Builds:
 
   - versionName: 8.3.130-fdroid
     versionCode: 4075
+    disable: junrar
     commit: 7e5fe1d119d3672bd71f522519a5fe19b0bc62a3
     subdir: app/
     sudo:
@@ -506,6 +523,7 @@ Builds:
 
   - versionName: 8.3.135-fdroid
     versionCode: 4085
+    disable: junrar
     commit: 37244620f17a2684ad0814c1c0ad5d4ed728ad30
     subdir: app/
     sudo:
@@ -536,6 +554,7 @@ Builds:
 
   - versionName: 8.4.1-fdroid
     versionCode: 4145
+    disable: junrar
     commit: ea0739a07d45c05d0d29a4f90000658e91698924
     subdir: app
     sudo:
@@ -567,6 +586,7 @@ Builds:
 
   - versionName: 8.4.6-fdroid
     versionCode: 4165
+    disable: junrar
     commit: 4f9cefddc40c320378985390cf223c8d1e26686b
     subdir: app
     sudo:
@@ -598,6 +618,7 @@ Builds:
 
   - versionName: 8.4.10-fdroid
     versionCode: 4190
+    disable: junrar
     commit: 002df1a572c17553262da850c8faddce028b34d1
     subdir: app
     sudo:
@@ -629,6 +650,7 @@ Builds:
 
   - versionName: 8.4.25-fdroid
     versionCode: 4254
+    disable: junrar
     commit: d32a7078e37ab8792238292a911280059a35c98f
     subdir: app
     sudo:
@@ -660,6 +682,7 @@ Builds:
 
   - versionName: 8.4.27-fdroid
     versionCode: 4258
+    disable: junrar
     commit: df4fe8fbdb1bab75a2838538078669f1f34cdbe5
     subdir: app
     sudo:
@@ -691,6 +714,7 @@ Builds:
 
   - versionName: 8.4.44-fdroid
     versionCode: 4334
+    disable: junrar
     commit: 2c0076f1148b8c6e57550612fd3ca7a5497ad146
     subdir: app
     sudo:
@@ -722,6 +746,7 @@ Builds:
 
   - versionName: 8.4.52-fdroid
     versionCode: 4370
+    disable: junrar
     commit: cad7803c206410f67b13ba403c7f5de5f9833c1d
     subdir: app
     sudo:
@@ -753,7 +778,7 @@ Builds:
 
   - versionName: 8.5.12-fdroid
     versionCode: 4390
-    commit: b542aca0b4794b59ff13c568d52aeb8c847a4c36
+    commit: 9f95ee4a38e304dd24730ce1b12f730da45bf6b2
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -764,23 +789,23 @@ Builds:
     gradle:
       - fdroid
     srclibs:
-      - MuPDF@1.16.1
+      - MuPDF@1.20.0-rc2
     rm:
       - Builder/libs
     prebuild:
       - sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
-      - sed -i -e '/com.google.gms.google-services/d' -e '/com.google.android.gms/d'
-        -e '/com.cloudrail/d' -e '/include "x86"/d' build.gradle
-      - sed -i -e '/^#!/a\set -e' -e 's|git clone .*|cp -r $$MuPDF$$/* mupdf-$VERSION|'
-        -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
+      - sed -i -e '/gms/d' -e '/firebase/d' -e '/com.cloudrail/d' -e '/enable true/d'
+        -e '/junrar/d' build.gradle
+      - sed -i -e '/^#!/a\set -e' -e 's|git clone .*|cp -r $$MuPDF$$ mupdf-$VERSION_TAG|'
+        -e '/mkdir mupdf/d' -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.20.0.sh
       - mkdir src/main/jniLibs/
     scanignore:
       - Builder/fonts/fonts.zip
       - app/src/fdroid/assets/fonts.zip
     build:
       - pushd ../Builder/
-      - ./link_to_mupdf_1.16.1.sh
-    ndk: r21e
+      - ./link_to_mupdf_1.20.0.sh
+    ndk: r23c
 
 MaintainerNotes: |-
     * Upstream builds separate APKs for each architecture but we build an universal APK.