diff --git a/core/c/jbigi/mbuild-all.sh b/core/c/jbigi/mbuild-all.sh
index a97139dfc..081627b6c 100755
--- a/core/c/jbigi/mbuild-all.sh
+++ b/core/c/jbigi/mbuild-all.sh
@@ -10,14 +10,14 @@
 # please add them here.
 # Do NOT add any X86 platforms, do that below in the x86 platform list.
 #
-MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 armv5tel mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447 atom"
+MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 armv5tel mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447"
 
 #
 # If you know of other platforms i2p on FREEBSD works on, 
 # please add them here.
 # Do NOT add any X86 platforms, do that below in the x86 platform list.
 #
-MISC_FREEBSD_PLATFORMS="atom alphaev56 ultrasparc2i"
+MISC_FREEBSD_PLATFORMS="alphaev56 ultrasparc2i"
 
 #
 # MINGW/Windows??
@@ -29,7 +29,7 @@ MISC_MINGW_PLATFORMS=""
 #
 # Oddly athlon64 builds.... I wonder what others can :-)
 #
-X86_PLATFORMS="pentium pentiummmx pentium2 pentium3 pentium4 k6 k62 k63 athlon pentiumm core2 athlon64 geode"
+X86_PLATFORMS="pentium pentiummmx pentium2 pentium3 pentiumm pentium4 k6 k62 k63 athlon core2 corei athlon64 geode atom nano viac3 viac32"
 
 
 #
@@ -93,7 +93,7 @@ function configure_file {
 	echo -e "\n\n\nAttempting configure for ${3}${5}${2}\n\n\n"
 	sleep 10
 	# Nonfatal bail out on unsupported platform.
-	../../gmp-${1}/configure --build=${2} && return 0
+	../../gmp-${1}/configure --build=${2} --with-pic && return 0
 	cd ..
 	rm -R "$2"
 	echo -e "\n\nSorry, ${3}${5}${2} is not supported on your build environment.\a"
diff --git a/core/c/mbuild.sh b/core/c/mbuild.sh
index 4591d5b7c..6794aa5e3 100755
--- a/core/c/mbuild.sh
+++ b/core/c/mbuild.sh
@@ -1,4 +1,6 @@
 #/bin/bash
+# Automatic build of so files, ignores failed builds.
+# Place latest gmp tarball in the jbigi dir, and exec this script.
 
 JBIGI=../../../installer/lib/jbigi/jbigi.jar
 
@@ -6,17 +8,23 @@ if [ -f jbigi.jarx ] ; then
 JBIGI=../jbigi.jar
 fi
 
-(cd jcpuid ; sh build.sh ; cd ..)
-(cd jbigi ; sh mbuild-all.sh ; cd ..)
+(cd jcpuid ; sh build.sh )
+(cd jbigi ; sh mbuild-all.sh )
 
+rm -Rf t
 mkdir t
 
 (
 	cd t
-	jar xf ../../../installer/lib/jbigi/jbigi.jar
+	cp ../../../installer/lib/jbigi/*.so ../../../installer/lib/jbigi/*.dll ../../../installer/lib/jbigi/*.jnilib .
 )
 
 cp jbigi/lib/net/i2p/util/* t/
+( 
+	cd t
+	for i in *.so ; { strip $i ; }
+)
+
 cp jcpuid/lib/freenet/support/CPUInformation/* t/
 
 (
@@ -25,4 +33,13 @@ cp jcpuid/lib/freenet/support/CPUInformation/* t/
 )
 
 rm -R t
+mkdir t
+cp jbigi/lib/net/i2p/util/* t/
+( 
+	cd t
+	for i in *.so ; { strip $i ; }
+)
+
+
 echo "jbigi.jar Refreshed."
+echo "raw files ar in t."
diff --git a/history.txt b/history.txt
index eeeb08daf..9d26d6dac 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2011-05-21 sponge
+    * mbuild.sh document and fixes
+    * mbuild-all.sh add cpu types
+
 2011-05-20 zzz
     * Certificate: Fix creation bug; improve router cert generation
     * DataHelper: