diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 91dfbd7bb5..fd327b725e 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -544,7 +544,13 @@ public class NativeBigInteger extends BigInteger {
         if (optimized) {
             if (sCPUType == null)
                 return null;
-            sAppend = "-" + sCPUType;        
+            // Add exceptions here if library files are identical,
+            // instead of adding duplicates to jbigi.jar
+            if (sCPUType.equals(JBIGI_OPTIMIZATION_K6_3) && !_isWin)
+                // k62 and k63 identical except on windows
+                sAppend = "-" + JBIGI_OPTIMIZATION_K6_2;
+            else
+                sAppend = "-" + sCPUType;        
         } else {
             sAppend = "-none";
         }
diff --git a/installer/lib/jbigi/libjbigi-freebsd-k63.so b/installer/lib/jbigi/libjbigi-freebsd-k63.so
deleted file mode 100644
index e288feacc3..0000000000
Binary files a/installer/lib/jbigi/libjbigi-freebsd-k63.so and /dev/null differ
diff --git a/installer/lib/jbigi/libjbigi-linux-k63.so b/installer/lib/jbigi/libjbigi-linux-k63.so
deleted file mode 100644
index 1c773b792b..0000000000
Binary files a/installer/lib/jbigi/libjbigi-linux-k63.so and /dev/null differ