diff --git a/java/ui/build.gradle b/java/ui/build.gradle
index 1a432717..b5a38a6c 100644
--- a/java/ui/build.gradle
+++ b/java/ui/build.gradle
@@ -88,11 +88,15 @@ shadowJar {
             // Unsupported platforms: FreeBSD/DragonFly, remove 32-bit
             'org/sqlite/native/DragonFlyBSD/**',
             'org/sqlite/native/FreeBSD/**',
-            'org/sqlite/native/Linux/android-arm/**',
+            'org/sqlite/native/Linux-Android/**',
             'org/sqlite/native/Linux/arm/**',
+            'org/sqlite/native/Linux/armv6/**',
             'org/sqlite/native/Linux/armv7/**',
             'org/sqlite/native/Linux/ppc64/**',
             'org/sqlite/native/Linux/x86/**',
+            'org/sqlite/native/Linux-Musl/x86/**',
+            'org/sqlite/native/Windows/aarch64/**',
+            'org/sqlite/native/Windows/armv7/**',
             'org/sqlite/native/Windows/x86/**')
 }
 
diff --git a/kokoro/dmg/build.sh b/kokoro/dmg/build.sh
index 5be4a427..264be6f9 100755
--- a/kokoro/dmg/build.sh
+++ b/kokoro/dmg/build.sh
@@ -125,8 +125,8 @@ if [[ $1 == release ]]; then
     --entitlements packaging/dmg/BinDiff.entitlements \
     --sign "Developer ID Application: Google LLC (EQHXZ8M8AV)" \
     --keychain "${HOME}/Library/Keychains/MacApplicationSigning.keychain" \
-    jardir/org/sqlite/native/Mac/aarch64/libsqlitejdbc.jnilib \
-    jardir/org/sqlite/native/Mac/x86_64/libsqlitejdbc.jnilib \
+    jardir/org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib \
+    jardir/org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib \
     "${app_dir}/BinDiff.app/Contents/runtime-arm64/Contents/MacOS/libjli.dylib" \
     "${app_dir}/BinDiff.app/Contents/runtime-x86_64/Contents/MacOS/libjli.dylib"
   (cd jardir; jar -c -m META-INF/MANIFEST.MF -f \