diff --git a/core/c/build.sh b/core/c/build.sh
index 6b7ece78a..8ac53fb63 100644
--- a/core/c/build.sh
+++ b/core/c/build.sh
@@ -7,7 +7,6 @@ mkdir -p t/freenet/support/CPUInformation/
 cp jcpuid/lib/freenet/support/CPUInformation/*jcpuid* t/freenet/support/CPUInformation/
 
 mkdir -p t/net/i2p/util/
-cp jbigi/lib/net/i2p/util/*jbigi* t/net/i2p/util/
 cp jbigi/lib/*jbigi* t/
 
 (cd t ; jar cf ../jbigi.jar . ; cd ..)
diff --git a/core/c/jbigi/build.sh b/core/c/jbigi/build.sh
index 9f03533dd..98ee1d168 100644
--- a/core/c/jbigi/build.sh
+++ b/core/c/jbigi/build.sh
@@ -1,41 +1,15 @@
 #/bin/sh
 
-case `uname -sr` in
-MINGW*)
-	echo "Building windows .dll's";;
-CYGWIN*)
-	echo "Building windows .dll's";;
-Linux*)
-	echo "Building linux .so's";;
-FreeBSD*)
-	echo "Building freebsd .so's";;
-*)
-	echo "Unsupported build environment"
-	exit;;
-esac
+echo "Building the jbigi library with GMP"
 
 echo "Extracting GMP..."
 tar -xjf gmp-4.1.4.tar.bz2
 echo "Building..."
-mkdir bin
-mkdir lib
-mkdir lib/net
-mkdir lib/net/i2p
-mkdir lib/net/i2p/util
-mkdir bin/local
+mkdir -p lib/
+mkdir -p bin/local
 cd bin/local
 ../../gmp-4.1.4/configure
 make
 sh ../../build_jbigi.sh static
-case `uname -sr` in
-MINGW*)
-	cp jbigi.dll ../../lib/jbigi;;
-CYGWIN*)
-	cp jbigi.dll ../../lib/jbigi;;
-Linux*)
-	cp libjbigi.so ../../lib/jbigi;;
-FreeBSD*)
-	cp libjbigi.so ../../lib/jbigi;;
-esac
-cd ..
-cd ..
+cp *jbigi???* ../../lib/
+cd ../..