diff --git a/mingw-w64-yosys/PKGBUILD b/mingw-w64-yosys/PKGBUILD
index 138c13da95..9cd960adb9 100644
--- a/mingw-w64-yosys/PKGBUILD
+++ b/mingw-w64-yosys/PKGBUILD
@@ -1,63 +1,68 @@
+
 _realname=yosys
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.30.r48
+pkgver=0.37
 pkgrel=1
 pkgdesc="A framework for RTL synthesis tools (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
+url="https://yosyshq.net/yosys"
+msys2_repository_url="https://github.com/YosysHQ/yosys"
+msys2_references=(
+  'archlinux: yosys'
+)
 license=('spdx:ISC')
-url="http://www.clifford.at/yosys/"
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 depends=(
+  "${MINGW_PACKAGE_PREFIX}-gcc-libs"
   "${MINGW_PACKAGE_PREFIX}-ghdl"
+  "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
   "${MINGW_PACKAGE_PREFIX}-python"
+  "${MINGW_PACKAGE_PREFIX}-readline"
+  "${MINGW_PACKAGE_PREFIX}-tcl"
+  "${MINGW_PACKAGE_PREFIX}-zlib"
 )
 checkdepends=("${MINGW_PACKAGE_PREFIX}-iverilog")
 makedepends=(
-  'flex'
-  'git'
-  "${MINGW_PACKAGE_PREFIX}-ghdl"
-  "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-cc"
 )
-
-_commit='b5b0b7e8'
+_ghdl_plugin_commit="0c4740a4f8f1e615cc587b3cd3849fa23a623862"
 source=(
-  "${_realname}::git+https://github.com/YosysHQ/${_realname}.git#commit=${_commit}"
-  "ghdl-yosys-plugin::git+https://github.com/ghdl/ghdl-yosys-plugin.git#commit=5b64ccfd"
-)
-sha256sums=(
-  'SKIP'
-  'SKIP'
+  "https://github.com/YosysHQ/yosys/archive/${_realname}-${pkgver}.tar.gz"
+  "abc-${pkgver}.tar.gz::https://github.com/YosysHQ/yosys/releases/download/${_realname}-${pkgver}/abc.tar.gz"
+  "https://github.com/ghdl/ghdl-yosys-plugin/archive/${_ghdl_plugin_commit}/ghdl-yosys-plugin-${_ghdl_plugin_commit}.tar.gz"
 )
+sha256sums=('98e91253b116728e5db037512a4d837529d408269358f06fe7b4633c89cf8756'
+            'a453ead5c6ee63a87588be63669bfc919cfe9a9b9b3a76d438fc11d90a6a9666'
+            '1c05d579f0799f027ede97adbc1283ad325ef8019614f9a3bca194997535176a')
+
+prepare() {
+  cd ${_realname}-${_realname}-${pkgver}
+  cp -r "${srcdir}/ghdl-yosys-plugin-${_ghdl_plugin_commit}"/src frontends/ghdl
+  cp -r "${srcdir}"/YosysHQ-abc-* abc
+}
 
 build() {
-  cd "${srcdir}/${_realname}"
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  cp -r ${_realname}-${_realname}-${pkgver} build-${MSYSTEM} && cd build-${MSYSTEM}
 
-  if [ "$CARCH" = "i686" ]; then
-    make config-msys2-32
-  fi
-
-  if [ "$CARCH" = "x86_64" ]; then
-    make config-msys2-64
-  fi
-
-  mv "${srcdir}/ghdl-yosys-plugin"/src frontends/ghdl
-  echo "ENABLE_GHDL=1" >> Makefile.conf
-  echo "GHDL_PREFIX=${MINGW_PREFIX}" >> Makefile.conf
+  make config-msys2-64
 
   make \
-    GIT_REV="${_commit}" \
-    PRETTY=0
+    PRETTY=0 \
+    ENABLE_GHDL=1 \
+    GHDL_PREFIX=${MINGW_PREFIX}
 }
 
 check() {
-  cd "${srcdir}/${_realname}"
+  cd build-${MSYSTEM}
   make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}"
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${srcdir}/${_realname}-${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }