diff --git a/mingw-w64-nextpnr/.gitignore b/mingw-w64-nextpnr/.gitignore
new file mode 100644
index 0000000000000..225b0fabb89f7
--- /dev/null
+++ b/mingw-w64-nextpnr/.gitignore
@@ -0,0 +1 @@
+nextpnr
diff --git a/mingw-w64-nextpnr/001-fix-find-boost-built-with-cmake.patch b/mingw-w64-nextpnr/001-fix-find-boost-built-with-cmake.patch
new file mode 100644
index 0000000000000..014369508fafc
--- /dev/null
+++ b/mingw-w64-nextpnr/001-fix-find-boost-built-with-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,8 +54,6 @@
+ else()
+     set(BBASM_MODE "string")
+ endif()
+-
+-set(Boost_NO_BOOST_CMAKE ON)
+ 
+ find_package(Threads)
+ if (Threads_FOUND)
diff --git a/mingw-w64-nextpnr/PKGBUILD b/mingw-w64-nextpnr/PKGBUILD
index 721826ab31c59..0e5307f7f917c 100644
--- a/mingw-w64-nextpnr/PKGBUILD
+++ b/mingw-w64-nextpnr/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=nextpnr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.6
-pkgrel=3
+pkgver=0.7
+pkgrel=1
 pkgdesc="Portable FPGA place and route tool (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -13,6 +13,7 @@ license=('spdx:ISC')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 depends=(
   "${MINGW_PACKAGE_PREFIX}-boost"
+  "${MINGW_PACKAGE_PREFIX}-gcc-libs"
   "${MINGW_PACKAGE_PREFIX}-omp"
   "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-qt5-base"
@@ -26,8 +27,12 @@ makedepends=(
   #"${MINGW_PACKAGE_PREFIX}-prjtrellis" Fails to build against v1.4
   "git"
 )
-source=("${_realname}::git+https://github.com/YosysHQ/${_realname}.git#tag=${_realname}-${pkgver}")
-sha256sums=('SKIP')
+source=("${_realname}::git+https://github.com/YosysHQ/${_realname}.git#tag=${_realname}-${pkgver}"
+        "001-fix-find-boost-built-with-cmake.patch"
+        "002-fix-build-with-boost-1.85.patch::https://github.com/YosysHQ/nextpnr/commit/f0859503.patch")
+sha256sums=('ed14f31c68a1ec2e7dbae78ebfb3a0a1baa16d9e5c6d0252ffae6485f61906a4'
+            '69f73e0ea3111f7580dc57b62bfefb0943b67de6c9245364f435abf58973d820'
+            '4e93475cc6c09b93b707d64e06779f419eddcc6f705e5f568180795f0915f745')
 
 # pkgver() {
 #   cd "${_realname}"
@@ -36,6 +41,9 @@ sha256sums=('SKIP')
 
 prepare() {
   cd "${srcdir}/${_realname}"
+  patch -p1 -i "${srcdir}"/001-fix-find-boost-built-with-cmake.patch
+  patch -p1 -i "${srcdir}"/002-fix-build-with-boost-1.85.patch
+
   git submodule update --init --recursive --depth=1
 }
 
@@ -65,7 +73,6 @@ build() {
     -DTRELLIS_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \
     -DARCH="generic;ice40${_extra_archs}" \
-    -DBUILD_HEAP=ON \
     -DUSE_OPENMP=ON \
     -DUSE_IPO=OFF \
     -DBUILD_PYTHON=ON \
@@ -73,6 +80,7 @@ build() {
     -DBUILD_TESTS=OFF \
     -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
     -DPython3_LIBRARY=${MINGW_PREFIX}/lib/libpython${_pyver}.dll.a \
+    -DBoost_NO_BOOST_CMAKE=OFF \
     ../${_realname}
 
   ${MINGW_PREFIX}/bin/cmake --build .