diff --git a/Makefile b/Makefile
index 037e0c9..577702f 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ install.exe: prep
 
 export RES_DIR="../i2p.i2p/installer/resources"
 export PKG_DIR="../i2p.i2p/pkg-temp"
+export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
 
 distclean: clean
 	rm -rf I2P
@@ -48,6 +49,7 @@ I2P:
 build/I2P: build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
+	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/
 
 configdir: src/I2P/config
 
diff --git a/build.sh b/build.sh
index d07d860..4e2e498 100755
--- a/build.sh
+++ b/build.sh
@@ -31,13 +31,13 @@ ant distclean preppkg-windows || true
 cd "$HERE"
 RES_DIR="$HERE/../i2p.i2p/installer/resources"
 I2P_JARS="$HERE/../i2p.i2p/pkg-temp/lib"
-I2P_JBIGI="$HERE/../i2p.i2p/installer/lib/jbigi"
+I2P_JBIGI="$HERE/../i2p.i2p/installer/lib//jbigi"
 I2P_PKG="$HERE/../i2p.i2p/pkg-temp"
 
 echo "compiling custom launcher"
 mkdir build
 cp "$I2P_JARS"/*.jar build
-cp "$I2P_JBIGI"/*windows*.dll build
+
 cd java
 "$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE"/build/i2p.jar:"$HERE"/build/router.jar:"$HERE"/build/routerconsole.jar net/i2p/router/WinLauncher.java net/i2p/router/WindowsUpdatePostProcessor.java
 cd ..