diff --git a/.github/workflows/winpkg.yml b/.github/workflows/winpkg.yml
index 51fd131..52c3a2e 100644
--- a/.github/workflows/winpkg.yml
+++ b/.github/workflows/winpkg.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Make Runtime
         run: /bin/bash ./win/makeruntime.sh
       - name: Make Package
-        run: tar -C ./.build/mingw64 -Jcvf mingw-pw3270-full.tar.xz .
+        run: tar -C ./.build -Jcvf mingw-pw3270-full.tar.xz .
       - uses: ncipollo/release-action@v1
         with:
           tag: ${{ steps.gettag.outputs.tag }}
diff --git a/win/makeruntime.sh.in b/win/makeruntime.sh.in
index 09ac6c2..9ae2682 100755
--- a/win/makeruntime.sh.in
+++ b/win/makeruntime.sh.in
@@ -29,8 +29,8 @@
 srcdir="$(dirname $(dirname $(readlink -f "${0}")))"
 prefix="@prefix@"
 
-imgdir=.build
-bindir="${imgdir}/bin"
+buildroot=.build
+bindir="${buildroot}${prefix}/bin"
 
 if [ -z "${WIN_ROOT}" ]; then
 	WIN_ROOT="/c/Windows"
@@ -41,15 +41,15 @@ export LANG=C
 install_bin() {
 
 	mkdir -p "${bindir}"
-	
+
 	AGAIN=1
 	until [ $AGAIN = 0 ]; do
 
 		SOURCES=$(mktemp)
 		REQUIRES=$(mktemp)
 
-		find "${imgdir}" -iname "*.dll" >	${SOURCES}
-		find "${imgdir}" -iname "*.exe" >>	${SOURCES}
+		find "${buildroot}${prefix}" -iname "*.dll" >	${SOURCES}
+		find "${buildroot}${prefix}" -iname "*.exe" >>	${SOURCES}
 	
 		while read FILENAME
 		do
--
libgit2 0.21.2