diff --git a/build-devkit.sh b/build-devkit.sh
index 79af82f..c7f2b93 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -149,18 +149,11 @@ export PATH=$PATH:$TOOLPATH/$package/bin
 if [ ! -z $CROSSBUILD ]; then
 	prefix=$INSTALLDIR/$CROSSBUILD/$package
 	CROSS_PARAMS="--build=`./config.guess` --host=$CROSSBUILD"
+	export PKG_CONFIG_PATH=$CROSSLIBPATH/pkgconfig
 else
 	prefix=$INSTALLDIR/$package
 fi
 
-if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
-	export PKG_CONFIG_PATH=/opt/i686-w64-mingw32/mingw/lib/pkgconfig
-fi
-
-if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
-	export PKG_CONFIG_PATH=/opt/x86_64-w64-mingw32/mingw/lib/pkgconfig
-fi
-
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
 
 	echo
@@ -265,27 +258,15 @@ if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Err
 if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh || { echo "Error building crtls"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 
-if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
+if [ ! -z $CROSSBUILD ]; then
 	if [ $VERSION -ne 3 ]; then
-		cp -v 	/opt/i686-w64-mingw32/mingw/lib/FreeImage.dll $prefix/bin
+		cp -v 	$CROSSLIBPATH/FreeImage.dll $prefix/bin
 	fi
 	if [ $VERSION -eq 1 ]; then
-		cp -v /opt/i686-w64-mingw32/i686-w64-mingw32/bin/libusb-1.0.dll $prefix/bin
+		cp -v $CROSSBINPATH/libusb-1.0.dll $prefix/bin
 	fi
-	cp -v	/opt/i686-w64-mingw32/mingw/lib/libstdc++-6.dll \
-		/opt/i686-w64-mingw32/mingw/lib/libgcc_s_sjlj-1.dll \
-		$prefix/bin
-fi
-
-if [ "$CROSSBUILD" = "x86_64-w64-mingw32" ]; then
-	if [ $VERSION -ne 3 ]; then
-		cp -v 	/opt/x86_64-w64-mingw32/mingw/lib/FreeImage.dll $prefix/bin
-	fi
-	if [ $VERSION -eq 1 ]; then
-		cp -v /opt/x86_64-mingw32/i686-w64-mingw32/bin/libusb-1.0.dll $prefix/bin
-	fi
-	cp -v	/opt/x86_64-w64-mingw32/mingw/lib/libstdc++-6.dll \
-		/opt/x86_64-w64-mingw32/mingw/lib/libgcc_s_sjlj-1.dll \
+	cp -v	$CROSSLIBPATH/libstdc++-6.dll \
+		$CROSSLIBPATH/libgcc_s_sjlj-1.dll \
 		$prefix/bin
 fi
 
diff --git a/cross-build-i686-w64-mingw32.sh b/cross-build-i686-w64-mingw32.sh
index bf8961e..219601e 100755
--- a/cross-build-i686-w64-mingw32.sh
+++ b/cross-build-i686-w64-mingw32.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 export CROSSBUILD=i686-w64-mingw32
+export CROSSLIBPATH=/opt/i686-w64-mingw32/mingw/lib
+export CROSSBINPATH=/opt/i686-w64-mingw32/mingw/bin
 export PATH=/opt/i686-w64-mingw32/bin:$PATH
diff --git a/cross-build-x86_64-w64-mingw32.sh b/cross-build-x86_64-w64-mingw32.sh
index d1c039e..e7fdb59 100755
--- a/cross-build-x86_64-w64-mingw32.sh
+++ b/cross-build-x86_64-w64-mingw32.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 export CROSSBUILD=x86_64-w64-mingw32
-export PATH=/opt/x86_64-w64-mingw32/bin:$PATH
+export CROSSLIBPATH=/opt/x86_64-mingw-w64/mingw/lib
+export CROSSBINPATH=/opt/x86_64-mingw-w64/mingw/bin
+export PATH=/opt/x86_64-mingw-w64/bin:$PATH