diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index bc4259992..4f51584ae 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -161,6 +161,9 @@ public class NativeBigInteger extends BigInteger {
     private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
                                          System.getProperty("os.arch").contains("64");
 
+    private static final boolean _isX86 = System.getProperty("os.arch").contains("86") ||
+	                                 System.getProperty("os.arch").equals("amd64");
+
     /* libjbigi.so vs jbigi.dll */
     private static final String _libPrefix = (_isWin || _isOS2 ? "" : "lib");
     private static final String _libSuffix = (_isWin || _isOS2 ? ".dll" : _isMac ? ".jnilib" : ".so");
@@ -168,10 +171,10 @@ public class NativeBigInteger extends BigInteger {
     private final static String sCPUType; //The CPU Type to optimize for (one of the above strings)
     
     static {
-        if (_isMac) // replace with osx/mac friendly jni cpu type detection when we have one
-            sCPUType = null;
-        else
+        if (_isX86) // Don't try to resolve CPU type on PPC and other non x86 hardware
             sCPUType = resolveCPUType();
+	else
+	    sCPUType = null;
         loadNative();
     }
     
diff --git a/history.txt b/history.txt
index c8d92005b..9df07486f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2011-06-12 kytv
+   * Add jcpuid files (32 & 64bit) for Intel Macs
+   * Compile jbigi-osx-none for Intel Macs. libjbigi-osx-none.jnilib
+     is now a fat binary combining the already existing PPC 
+     compile and my new x86 build.
+
 2011-06-11 zzz
     * i2psnark Polish translation, thanks polacco
 
diff --git a/installer/lib/jbigi/libjcpuid-x86-osx.jnilib b/installer/lib/jbigi/libjcpuid-x86-osx.jnilib
new file mode 100644
index 000000000..018421401
Binary files /dev/null and b/installer/lib/jbigi/libjcpuid-x86-osx.jnilib differ
diff --git a/installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib b/installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib
new file mode 100644
index 000000000..99275bb78
Binary files /dev/null and b/installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib differ
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f0b07e77..b7509f1d3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 24;
+    public final static long BUILD = 25;
 
     /** for example "-test" */
     public final static String EXTRA = "";