diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index d52854bfa52e..4f44b9d6057e 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,64 +1,63 @@
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.3
+DISTVERSION=	0.9.0
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Next-generation Vim
 WWW=		https://neovim.io/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	gperf:devel/gperf \
 		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
 		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
 LIB_DEPENDS=	libluv.so:devel/luv \
 		libmsgpackc.so:devel/msgpack-c \
 		libtermkey.so:devel/libtermkey \
 		libtree-sitter.so:devel/tree-sitter \
 		libunibilium.so:devel/unibilium \
 		libuv.so:devel/libuv \
 		libvterm.so:devel/libvterm
 
-USES=		cmake cpe iconv lua:52,build luajit pathfix pkgconfig
+USES=		cmake cpe gettext iconv lua:52,build luajit pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.9:libmpack_lua
 PORTSCOUT=	limit:^[0-9\.v]+$$
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}"
 
 DATADIR=	${PREFIX}/share/nvim
 PORTDATA=	runtime
 
 OPTIONS_DEFINE=	NLS PYNVIM
 OPTIONS_SUB=	yes
 
 PYNVIM_DESC=	Enable support for plugins written in python
 
 NLS_CMAKE_BOOL=		ENABLE_LIBINTL
-NLS_USES=		gettext
 PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
 PYNVIM_USES=		python:run
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMakeLists.txt
 
 pre-build:
 	${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src
 	${MKDIR} ${BUILD_WRKSRC}/src/nvim
 	(cd ${WRKSRC_libmpack_lua} && ${CC} ${CFLAGS} -fPIC \
 		-I${LUA_INCDIR} -shared lmpack.c -o \
 		${BUILD_WRKSRC}/src/nvim/mpack.so \
 		${LUA_LIBDIR}/liblua-${LUA_VER}.so)
 	${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mpack.so
 
 .include <bsd.port.mk>
diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
index 52c59cae2486..d39b69c27f65 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1675348989
-SHA256 (neovim-neovim-v0.8.3_GH0.tar.gz) = adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1
-SIZE (neovim-neovim-v0.8.3_GH0.tar.gz) = 11406282
+TIMESTAMP = 1680886266
+SHA256 (neovim-neovim-v0.9.0_GH0.tar.gz) = 39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937
+SIZE (neovim-neovim-v0.9.0_GH0.tar.gz) = 11549103
 SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956
 SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966
 SHA256 (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = e94d5cf95d7479dca00ff23755fe05a440f11f9d203635e862ad8842de95f40a
 SIZE (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = 16087
diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/files/patch-CMakeLists.txt
index 2527c6c11878..564ac85f400b 100644
--- a/editors/neovim/files/patch-CMakeLists.txt
+++ b/editors/neovim/files/patch-CMakeLists.txt
@@ -1,14 +1,14 @@
---- CMakeLists.txt.orig	2021-07-02 16:36:49 UTC
+--- CMakeLists.txt.orig	2023-04-07 16:52:01 UTC
 +++ CMakeLists.txt
-@@ -517,9 +517,9 @@ endforeach()
+@@ -163,9 +163,9 @@ foreach(CFGNAME ${CMAKE_CONFIGURATION_TYPES})
+   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)
+ endforeach()
  
- # Find Lua interpreter
- include(LuaHelpers)
 -set(LUA_DEPENDENCIES lpeg mpack bit)
 +set(LUA_DEPENDENCIES lpeg bit)
  if(NOT LUA_PRG)
 -  foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
 +  foreach(CURRENT_LUA_PRG luajit)
      unset(_CHECK_LUA_PRG CACHE)
      unset(LUA_PRG_WORKS)
      find_program(_CHECK_LUA_PRG ${CURRENT_LUA_PRG})
diff --git a/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim b/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim
deleted file mode 100644
index add09834c402..000000000000
--- a/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-blacklistd has been renamed to blocklistd, so UseBlocklist
-is the preferred alias for UseBlacklist.
-
-See https://github.com/freebsd/freebsd-src/commit/e426c743
-
---- runtime/syntax/sshdconfig.vim.orig	2018-07-26 22:51:00 UTC
-+++ runtime/syntax/sshdconfig.vim
-@@ -221,6 +221,8 @@ syn keyword sshdconfigKeyword Subsystem
- syn keyword sshdconfigKeyword SyslogFacility
- syn keyword sshdconfigKeyword TCPKeepAlive
- syn keyword sshdconfigKeyword TrustedUserCAKeys
-+syn keyword sshdconfigKeyword UseBlacklist
-+syn keyword sshdconfigKeyword UseBlocklist
- syn keyword sshdconfigKeyword UseDNS
- syn keyword sshdconfigKeyword UseLogin
- syn keyword sshdconfigKeyword UsePAM