diff --git a/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so b/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so
index 8d28a4c36..0b507ffbf 100755
Binary files a/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so and b/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so differ
diff --git a/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so b/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so
index 758bb381f..c52e75f85 100755
Binary files a/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so and b/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so differ
diff --git a/lib/client/src/main/jniLibs/build.sh b/lib/client/src/main/jniLibs/build.sh
index b9048afa6..c924742da 100755
--- a/lib/client/src/main/jniLibs/build.sh
+++ b/lib/client/src/main/jniLibs/build.sh
@@ -3,10 +3,13 @@
 # build GMP and libjbigi.so using the Android tools directly
 #
 # WARNING:
-# BROKEN - not updated for r19 NDK, aarch64, or GMP 6.1.2
+# BROKEN - not updated for r25c NDK, aarch64, x86_64, or GMP 6.2.1
 # Use the following in i2p.i2p source core/c/jbigi:
 # TARGET=android BITS=32 mbuild_all.sh
 # TARGET=android BITS=64 mbuild_all.sh
+# Or if you want to compile for armv7a/aarch64 on different architecture :
+# ANDROID_FORCE_ARM=true TARGET=android BITS=32 mbuild_all.sh
+# ANDROID_FORCE_ARM=true TARGET=android BITS=64 mbuild_all.sh
 #
 # TODO: Get more settings from environment variables set in ../custom-rules.xml
 #
diff --git a/lib/client/src/main/jniLibs/x86/libjbigi.so b/lib/client/src/main/jniLibs/x86/libjbigi.so
new file mode 100755
index 000000000..d7cf30c14
Binary files /dev/null and b/lib/client/src/main/jniLibs/x86/libjbigi.so differ
diff --git a/lib/client/src/main/jniLibs/x86_64/libjbigi.so b/lib/client/src/main/jniLibs/x86_64/libjbigi.so
new file mode 100755
index 000000000..4611e068f
Binary files /dev/null and b/lib/client/src/main/jniLibs/x86_64/libjbigi.so differ