diff --git a/mingw-w64-python-hunter/PKGBUILD b/mingw-w64-python-hunter/PKGBUILD
index 40bd099d7e..1aca4677ee 100644
--- a/mingw-w64-python-hunter/PKGBUILD
+++ b/mingw-w64-python-hunter/PKGBUILD
@@ -3,20 +3,22 @@
 _realname=hunter
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.6.1
-pkgrel=3
+pkgver=3.7.0
+pkgrel=1
 pkgdesc="Hunter is a flexible code tracing toolkit (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/ionelmc/python-hunter'
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://python-hunter.readthedocs.io/'
+msys2_repository_url='https://github.com/ionelmc/python-hunter'
 msys2_references=(
   'pypi: hunter'
 )
-license=('BSD')
+license=('spdx:BSD-2-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python-colorama"
          "${MINGW_PACKAGE_PREFIX}-python-manhole")
 optdepends=("${MINGW_PACKAGE_PREFIX}-gdb: for remote support")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-wheel"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-installer"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
              "${MINGW_PACKAGE_PREFIX}-cython"
@@ -27,32 +29,22 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-benchmark"
               #"${MINGW_PACKAGE_PREFIX}-python-virtualenv"
              )
 options=('!strip')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/ionelmc/python-hunter/archive/v$pkgver.tar.gz")
-sha512sums=('1215da594c51cfce6341e3193de14a3386de4d28f0e0745c11b8bd6ba45d33d91628b8abfb528716968f119fa6ef64e7e2fb9ee222af16bfc8519eda354edd11')
-
-prepare() {
-  rm -rf python-build-${MSYSTEM} || true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
-
-  export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
-}
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha512sums=('3f4ac69206367813c6f56eb4329d4ebf3ce6e1f6c5e257a27121a3e0dfacc761ac69da18e6d12b614d4f3c8425835c69f8a5b0ec6764ce910287a0b9c62d90e0')
 
 build() {
-  msg "Python build for ${MSYSTEM}"
-  cd "${srcdir}/python-build-${MSYSTEM}"
-  ${MINGW_PREFIX}/bin/python setup.py build
+  export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
+
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
+  python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1 --skip-build
+  cd "python-build-${MSYSTEM}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+    python -m installer --prefix=${MINGW_PREFIX} \
+    --destdir="${pkgdir}" dist/*.whl
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
-
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
-    # Remove shebang line
-    sed -e '1 { s/^#!.*$// }' -i "${_f}"
-  done
 }