diff --git a/build.xml b/build.xml
index 9c8fa4c4f3..6a96b143c6 100644
--- a/build.xml
+++ b/build.xml
@@ -178,7 +178,7 @@
         <launch4j configFile="./installer/i2pstandalone.xml" />
 	<!-- thazzit -->
     </target>
-    <target name="compile" />
+
     <target name="jar" depends="jarSmall" >
         <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
         <copy file="apps/sam/java/build/sam.jar" todir="build/" />
@@ -186,8 +186,9 @@
         <copy file="apps/susidns/src/susidns.war" todir="build/" />
         <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
         <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
+
     </target>
-    <target name="jarSmall" depends="compile" >
+    <target name="jarSmall" depends="builddepSmall" >
         <copy file="core/java/build/i2p.jar" todir="build/" />
         <copy file="router/java/build/router.jar" todir="build/" />
         <copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
@@ -195,9 +196,27 @@
         <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
         <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
         <copy file="apps/systray/java/build/systray.jar" todir="build/" />
-        <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     </target>
+
+    <target name="jbigi">
+        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
+            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
+        </jar>
+    </target>
+
+    <target name="jbigi-windows-only" >
+        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
+            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
+        </jar>
+    </target>
+
+    <target name="jbigi-linux-only">
+        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
+            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
+        </jar>
+    </target>
+
     <!-- the apps need to compile the jsps to poupdate -->
     <target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty" >
         <ant dir="apps/routerconsole/java/" target="poupdate" />
@@ -361,7 +380,7 @@
         </delete>
     </target>
 
-    <target name="preppkg" depends="preppkg-linux, preppkg-windows">
+    <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
         <copy todir="pkg-temp/lib/wrapper/freebsd/">
             <fileset dir="installer/lib/wrapper/freebsd/" />
@@ -391,14 +410,8 @@
     </target>
 
     <!-- only what is needed for debian, etc. -->
-    <target name="preppkg-linux-only" depends="preppkg-linux">
-        <!-- rip the non-linux stuff out of jbigi.jar -->
-        <mkdir dir="tmpextract" />
-        <unjar src="build/jbigi.jar" dest="tmpextract/" />
-        <jar destfile="pkg-temp/lib/jbigi.jar" >
-            <fileset dir="tmpextract/" includes="*linux*" />
-        </jar>
-        <delete dir="tmpextract/" />
+    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
+        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     </target>
 
     <target name="preppkg-linux" depends="preppkg-base">
@@ -755,7 +768,7 @@
     </target>
     <target name="findbugs" depends="build2">
         <echo message="Starting findbugs, this will take a while..." />
-        <exec executable="nice">
+        <exec executable="nice" failonerror="true">
             <arg value="findbugs"/>
             <arg value="-textui"/>
             <arg value="-projectName"/>
@@ -776,7 +789,6 @@
             <arg value="build/i2psnark.war"/>
             <arg value="build/i2ptunnel.jar"/>
             <arg value="build/i2ptunnel.war"/>
-            <arg value="build/jbigi.jar"/>
             <arg value="build/mstreaming.jar"/>
             <arg value="build/router.jar/"/>
             <arg value="build/routerconsole.jar"/>
@@ -1021,25 +1033,11 @@
 		we need to make sure its small, with NO redundent jars or wars.
 		thus cleaning is required before each build-->
 	<target name="buildSmallOnly" depends="pkg-portable-clean,buildSmall"/>
+
 <!-- *1* preparing the jars by OS dependent de-bloating -->
-	<target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly">
-		<!-- rip the non-windows stuff out of jbigi.jar -->
-		<mkdir dir="tmpextract" />
-		<unjar src="build/jbigi.jar" dest="tmpextract/" />
-		<jar destfile="build/jbigi.jar" >
-			<fileset dir="tmpextract/" includes="*windows*" />
-		</jar>
-		<delete dir="tmpextract/" />
-	</target>
-	<target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly">
-		<!-- rip the non-linux stuff out of jbigi.jar -->
-		<mkdir dir="tmpextract" />
-		<unjar src="build/jbigi.jar" dest="tmpextract/" />
-		<jar destfile="build/jbigi.jar" >
-			<fileset dir="tmpextract/" includes="*linux*" />
-		</jar>
-		<delete dir="tmpextract/" />
-	</target>
+	<target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly, jbigi-windows-only" />
+
+	<target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly, jbigi-linux-only" />
 
 <!-- *2* os independent procedure  -->
 	<target name="preppkg-portable-basic" >
diff --git a/installer/lib/jbigi/jbigi-windows-athlon.dll b/installer/lib/jbigi/jbigi-windows-athlon.dll
new file mode 100644
index 0000000000..993277816c
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-athlon.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-athlon64.dll b/installer/lib/jbigi/jbigi-windows-athlon64.dll
new file mode 100644
index 0000000000..993277816c
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-athlon64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-k6.dll b/installer/lib/jbigi/jbigi-windows-k6.dll
new file mode 100644
index 0000000000..947bafec5f
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-k6.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-k62.dll b/installer/lib/jbigi/jbigi-windows-k62.dll
new file mode 100644
index 0000000000..d98c6d1ca0
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-k62.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-k63.dll b/installer/lib/jbigi/jbigi-windows-k63.dll
new file mode 100644
index 0000000000..fd67e8f231
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-k63.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-none.dll b/installer/lib/jbigi/jbigi-windows-none.dll
new file mode 100644
index 0000000000..0528400b11
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-none.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentium.dll b/installer/lib/jbigi/jbigi-windows-pentium.dll
new file mode 100644
index 0000000000..f1877792a3
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentium.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentium2.dll b/installer/lib/jbigi/jbigi-windows-pentium2.dll
new file mode 100644
index 0000000000..0de688555a
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentium2.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentium3.dll b/installer/lib/jbigi/jbigi-windows-pentium3.dll
new file mode 100644
index 0000000000..87551bf002
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentium3.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentium4.dll b/installer/lib/jbigi/jbigi-windows-pentium4.dll
new file mode 100644
index 0000000000..2e40144c2f
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentium4.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentiummmx.dll b/installer/lib/jbigi/jbigi-windows-pentiummmx.dll
new file mode 100644
index 0000000000..1614f12211
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentiummmx.dll differ
diff --git a/installer/lib/jbigi/jbigi.jar b/installer/lib/jbigi/jbigi.jar
deleted file mode 100644
index 518ea48b5d..0000000000
Binary files a/installer/lib/jbigi/jbigi.jar and /dev/null differ
diff --git a/installer/lib/jbigi/jbigi.jar.sig b/installer/lib/jbigi/jbigi.jar.sig
deleted file mode 100644
index 5ecb780a90..0000000000
Binary files a/installer/lib/jbigi/jbigi.jar.sig and /dev/null differ
diff --git a/installer/lib/jbigi/jcpuid-x86-windows.dll b/installer/lib/jbigi/jcpuid-x86-windows.dll
new file mode 100644
index 0000000000..ed77562e82
Binary files /dev/null and b/installer/lib/jbigi/jcpuid-x86-windows.dll differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-athlon.so b/installer/lib/jbigi/libjbigi-freebsd-athlon.so
new file mode 100644
index 0000000000..c1dfa2f99b
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-athlon.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-k6.so b/installer/lib/jbigi/libjbigi-freebsd-k6.so
new file mode 100644
index 0000000000..fdc3c55700
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-k6.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-k62.so b/installer/lib/jbigi/libjbigi-freebsd-k62.so
new file mode 100644
index 0000000000..e288feacc3
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-k62.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-k63.so b/installer/lib/jbigi/libjbigi-freebsd-k63.so
new file mode 100644
index 0000000000..e288feacc3
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-k63.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-none.so b/installer/lib/jbigi/libjbigi-freebsd-none.so
new file mode 100644
index 0000000000..1011dee73e
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-none.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-pentium.so b/installer/lib/jbigi/libjbigi-freebsd-pentium.so
new file mode 100644
index 0000000000..948001d73e
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-pentium.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-pentium2.so b/installer/lib/jbigi/libjbigi-freebsd-pentium2.so
new file mode 100644
index 0000000000..fa8b0095d8
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-pentium2.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-pentium3.so b/installer/lib/jbigi/libjbigi-freebsd-pentium3.so
new file mode 100644
index 0000000000..fa8b0095d8
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-pentium3.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-pentium4.so b/installer/lib/jbigi/libjbigi-freebsd-pentium4.so
new file mode 100644
index 0000000000..ded68265d9
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-pentium4.so differ
diff --git a/installer/lib/jbigi/libjbigi-freebsd-pentiummmx.so b/installer/lib/jbigi/libjbigi-freebsd-pentiummmx.so
new file mode 100644
index 0000000000..89a6e4ffd1
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-freebsd-pentiummmx.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-athlon.so b/installer/lib/jbigi/libjbigi-linux-athlon.so
new file mode 100644
index 0000000000..2263a36013
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-athlon.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-athlon64.so b/installer/lib/jbigi/libjbigi-linux-athlon64.so
new file mode 100644
index 0000000000..920b3dd616
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-athlon64.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-k6.so b/installer/lib/jbigi/libjbigi-linux-k6.so
new file mode 100644
index 0000000000..6bdb18eda5
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-k6.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-k62.so b/installer/lib/jbigi/libjbigi-linux-k62.so
new file mode 100644
index 0000000000..1c773b792b
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-k62.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-k63.so b/installer/lib/jbigi/libjbigi-linux-k63.so
new file mode 100644
index 0000000000..1c773b792b
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-k63.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-none.so b/installer/lib/jbigi/libjbigi-linux-none.so
new file mode 100644
index 0000000000..6943730e29
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-none.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-pentium.so b/installer/lib/jbigi/libjbigi-linux-pentium.so
new file mode 100644
index 0000000000..5fe57795e9
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-pentium.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-pentium2.so b/installer/lib/jbigi/libjbigi-linux-pentium2.so
new file mode 100644
index 0000000000..152bf9e9a5
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-pentium2.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-pentium3.so b/installer/lib/jbigi/libjbigi-linux-pentium3.so
new file mode 100644
index 0000000000..152bf9e9a5
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-pentium3.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-pentium4.so b/installer/lib/jbigi/libjbigi-linux-pentium4.so
new file mode 100644
index 0000000000..74e2df2285
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-pentium4.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-pentiummmx.so b/installer/lib/jbigi/libjbigi-linux-pentiummmx.so
new file mode 100644
index 0000000000..8acc21b4fe
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-pentiummmx.so differ
diff --git a/installer/lib/jbigi/libjbigi-linux-viac3.so b/installer/lib/jbigi/libjbigi-linux-viac3.so
new file mode 100644
index 0000000000..02fdacd69e
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-linux-viac3.so differ
diff --git a/installer/lib/jbigi/libjbigi-osx-none.jnilib b/installer/lib/jbigi/libjbigi-osx-none.jnilib
new file mode 100644
index 0000000000..ccafcac2e2
Binary files /dev/null and b/installer/lib/jbigi/libjbigi-osx-none.jnilib differ
diff --git a/installer/lib/jbigi/libjcpuid-x86-freebsd.so b/installer/lib/jbigi/libjcpuid-x86-freebsd.so
new file mode 100644
index 0000000000..a2d6d2dc42
Binary files /dev/null and b/installer/lib/jbigi/libjcpuid-x86-freebsd.so differ
diff --git a/installer/lib/jbigi/libjcpuid-x86-linux.so b/installer/lib/jbigi/libjcpuid-x86-linux.so
new file mode 100644
index 0000000000..ab90984a2e
Binary files /dev/null and b/installer/lib/jbigi/libjcpuid-x86-linux.so differ