diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
index d98563e0025..7654cc64a87 100644
--- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
+++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
@@ -18,14 +18,14 @@
      else()
        message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
      endif()
---- a/runtime/autoload/health/nvim.vim
-+++ b/runtime/autoload/health/nvim.vim
-@@ -135,7 +135,7 @@ function! s:check_performance() abort
-   let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
-   if empty(buildtype)
-     call health#report_error('failed to get build type from :version')
--  elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
-+  elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|None)'
-     call health#report_ok(buildtype)
+--- a/runtime/lua/nvim/health.lua
++++ b/runtime/lua/nvim/health.lua
+@@ -152,7 +152,7 @@
+   local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]])
+   if empty(buildtype) then
+     health.report_error('failed to get build type from :version')
+-  elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then
++  elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo|None)]]):match_str(buildtype) then
+     health.report_ok(buildtype)
    else
-     call health#report_info(buildtype)
+     health.report_info(buildtype)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 9c7a73bf6fb..19e50b71d0e 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,11 +1,11 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.8.3
+version=0.9.0
 revision=1
 build_style=cmake
 build_helper="qemu"
 # MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3
-configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)
+configure_args="-DCI_BUILD=OFF -DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)
  -DMIN_LOG_LEVEL=3"
 hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
  $(vopt_if luajit LuaJIT lua51)"
@@ -16,7 +16,7 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
-checksum=adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1
+checksum=39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937
 
 build_options=luajit
 
@@ -39,6 +39,8 @@ CFLAGS=-UNDEBUG
 pre_configure() {
 	vsed -i runtime/CMakeLists.txt \
 		-e "s|\".*/bin/nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"
+	vsed -i src/nvim/po/CMakeLists.txt \
+		-e "s|\$<TARGET_FILE:nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"
 }
 
 post_install() {