diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 2f10bda1..a56d1e87 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -29,6 +29,9 @@ jobs:
           latest: true
           fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"      
       - name: CI-Build
-        run: ./win/ci-build.sh
+        run: |
+          pacman -U --noconfirm *.pkg.tar.zst
+          dos2unix PKGBUILD.mingw
+          makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw
 
 
diff --git a/PKGBUILD.mingw b/PKGBUILD.mingw
index 0e5ff500..6feb4782 100644
--- a/PKGBUILD.mingw
+++ b/PKGBUILD.mingw
@@ -25,7 +25,7 @@ source=()
 
 pkgver=$(grep AC_INIT "${startdir}/configure.ac" | cut -d[ -f3 | cut -d] -f1)
 pkgrel=0
-pkgdesc="TN3270 Access library"
+pkgdesc="IBM 3270 Terminal emulator for GTK"
 url="https://github.com/PerryWerneck/${_realname}"
 arch=(i686 x86_64)
 license=(LGPL-3.0-or-later)
@@ -38,12 +38,12 @@ conflicts=($pkgname)
 
 prepare() {
   rm -fr "$srcdir/$pkgname"
-  ln -snf "$startdir" "$srcdir/$pkgname"
+  mkdir -p "$srcdir/$pkgname"
 }
 
 build() {
-  cd $pkgname
-  ./autogen.sh \
+  cd "$srcdir/$pkgname"
+  ${startdir}/autogen.sh \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -53,10 +53,11 @@ build() {
 }
 
 package() {
-  cd $pkgname
+  cd "$srcdir/$pkgname"
   make DESTDIR="${pkgdir}" install
   install \
     -Dm644 \
-    "LICENSE" \
+    "${startdir}/LICENSE" \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
+
diff --git a/autogen.sh b/autogen.sh
index 316fc827..d09d6769 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -49,7 +49,7 @@ autopoint
 
 cd ${builddir}
 
-test -n "$NOCONFIGURE" || "./configure" "$@"
+test -n "$NOCONFIGURE" || "$srcdir/configure" --srcdir=${srcdir} $@
 
 
 
diff --git a/win/ci-build.sh b/win/ci-build.sh
index ca9aeefb..40e1309a 100644
--- a/win/ci-build.sh
+++ b/win/ci-build.sh
@@ -25,11 +25,7 @@
 
 echo "Running ${0}"
 
-LOGFILE=build.log
-rm -f ${LOGFILE}
-
 die ( ) {
-	[ -s $LOGFILE ] && tail $LOGFILE
 	[ "$1" ] && echo "$*"
 	exit -1
 }