diff --git a/core/c/build.sh b/core/c/build.sh
index ca2826dcf..6b7ece78a 100644
--- a/core/c/build.sh
+++ b/core/c/build.sh
@@ -4,10 +4,11 @@
 (cd jbigi ; sh build.sh ; cd ..)
 
 mkdir -p t/freenet/support/CPUInformation/
-cp jcpuid/lib/freenet/support/CPUInformation/*jcpuid-* 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/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 20a3f4acf..2e1852571 100644
--- a/core/c/jbigi/build.sh
+++ b/core/c/jbigi/build.sh
@@ -29,13 +29,13 @@ make
 sh ../../build_jbigi.sh static
 case `uname -sr` in
 MINGW*)
-	cp jbigi.dll ../../lib/net/i2p/util/jbigi-windows-x86.dll;;
+	cp jbigi.dll ../../lib/jbigi;;
 CYGWIN*)
-	cp jbigi.dll ../../lib/net/i2p/util/jbigi-windows-x86.dll;;
+	cp jbigi.dll ../../lib/jbigi;;
 Linux*)
-	cp libjbigi.so ../../lib/net/i2p/util/libjbigi-linux-x86.so;;
+	cp libjbigi.so ../../lib/jbigi;;
 FreeBSD*)
-	cp libjbigi.so ../../lib/net/i2p/util/libjbigi-freebsd-x86.so;;
+	cp libjbigi.so ../../lib/jbigi;;
 esac
 cd ..
 cd ..