diff --git a/mingw-w64-neovim/0001-cmake-disable-bundling.patch b/mingw-w64-neovim/0001-cmake-disable-bundling.patch
index 4ab2ed100b..9a57f9800e 100644
--- a/mingw-w64-neovim/0001-cmake-disable-bundling.patch
+++ b/mingw-w64-neovim/0001-cmake-disable-bundling.patch
@@ -1,17 +1,6 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -691,7 +691,7 @@
- add_subdirectory(test/functional/fixtures)  # compile test programs
- add_subdirectory(runtime)
- get_directory_property(GENERATED_HELP_TAGS DIRECTORY runtime DEFINITION GENERATED_HELP_TAGS)
--if(WIN32)
-+if(FALSE)
-   install_helper(
-     FILES ${DEPS_PREFIX}/share/nvim-qt/runtime/plugin/nvim_gui_shim.vim
-     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim-qt/runtime/plugin)
 --- a/src/nvim/CMakeLists.txt
 +++ b/src/nvim/CMakeLists.txt
-@@ -463,7 +463,7 @@
+@@ -668,7 +668,7 @@
    endif()
  endif()
  
diff --git a/mingw-w64-neovim/PKGBUILD b/mingw-w64-neovim/PKGBUILD
index 554cb2ad20..da359ea35b 100644
--- a/mingw-w64-neovim/PKGBUILD
+++ b/mingw-w64-neovim/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=neovim
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.8.3
+pkgver=0.9.0
 pkgrel=1
 pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs (mingw-w64)'
 arch=('any')
@@ -27,12 +27,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-unibilium")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/neovim/neovim/archive/refs/tags/v${pkgver}.tar.gz"
         0001-cmake-disable-bundling.patch)
-sha256sums=('adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1'
-            '354a0355093bd7e26dab6ad1dc2ad3158a583bf462fc595ae44824e3c69d72f6')
+sha256sums=('39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937'
+            '89a7ac9bad682e9d1b008900ae4b1d2098bfa942d31ade7ea7283295b39aefe5')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
   patch -p1 -i "${srcdir}/0001-cmake-disable-bundling.patch"
+
+  # Werror is enabled in CI only
+  sed "s/-Werror/-Wall/g" -i src/nvim/CMakeLists.txt
 }
 
 build() {
@@ -52,6 +55,7 @@ build() {
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      -DUSE_BUNDLED_NVIMQT=OFF \
       "${extra_config[@]}" \
       ../${_realname}-${pkgver}