diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 27d555af42eb5ef930909548ced7156b4f74f613..730972bab90736372307b10eb890d215502f0d7e 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -180,9 +180,6 @@ public class NativeBigInteger extends BigInteger {
             } catch (UnknownCPUException e) {
                 // log?
             }
-            if (_isFreebsd)
-                // athlon64 not available for freebsd
-                return JBIGI_OPTIMIZATION_ATHLON;
             return JBIGI_OPTIMIZATION_ATHLON64;
         }
         
@@ -614,6 +611,10 @@ public class NativeBigInteger extends BigInteger {
             // Add fallbacks for any 32-bit that were added 0.8.7 or later here
             if (primary.equals(JBIGI_OPTIMIZATION_ATOM))
                 rv.add(_libPrefix + getMiddleName1() + JBIGI_OPTIMIZATION_PENTIUM3 + _libSuffix);
+            // athlon is always a fallback for 64 bit, we have it for all architectures
+            // and it should be much better than "none"
+            if (_is64)
+                rv.add(_libPrefix + getMiddleName1() + JBIGI_OPTIMIZATION_ATHLON + _libSuffix);
 
         } else {
             if (_is64) {
diff --git a/installer/lib/jbigi/jbigi-windows-athlon64.dll b/installer/lib/jbigi/jbigi-windows-athlon64.dll
deleted file mode 100644
index 993277816c8056cecf8402faba3a6a2f8eaa1380..0000000000000000000000000000000000000000
Binary files a/installer/lib/jbigi/jbigi-windows-athlon64.dll and /dev/null differ