diff --git a/mingw-w64-octave/PKGBUILD b/mingw-w64-octave/PKGBUILD
index 898995fa33..0358f292fb 100644
--- a/mingw-w64-octave/PKGBUILD
+++ b/mingw-w64-octave/PKGBUILD
@@ -24,7 +24,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
          "${MINGW_PACKAGE_PREFIX}-sundials"
          "${MINGW_PACKAGE_PREFIX}-qrupdate"
          "${MINGW_PACKAGE_PREFIX}-qscintilla"
-         "${MINGW_PACKAGE_PREFIX}-qt5")
+         "${MINGW_PACKAGE_PREFIX}-qt5-tools")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-fortran"
              "${MINGW_PACKAGE_PREFIX}-gnuplot"
              "${MINGW_PACKAGE_PREFIX}-fltk"
@@ -44,9 +44,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
@@ -65,7 +65,7 @@ build() {
 }
 
 package() {
-  make -C "build-${MINGW_CHOST}" DESTDIR="${pkgdir}" install
+  make -C "build-${MSYSTEM}" DESTDIR="${pkgdir}" install
 
   # override default command for running "makeinfo" in init file
   echo 'makeinfo_program (sprintf ("%s && cd %s/../usr/bin && perl makeinfo", OCTAVE_HOME ()(1:2), OCTAVE_HOME ()));' >> "${pkgdir}/${MINGW_PREFIX}/share/octave/site/m/startup/octaverc"