diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 343e19df0e06..76b409d71449 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.1
+DISTVERSION=	0.11.2
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Next-generation Vim
 WWW=		https://neovim.io/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
 LIB_DEPENDS=	libluv.so:devel/luv \
 		libmsgpack-c.so:devel/msgpack-c \
 		libtree-sitter.so:devel/tree-sitter \
 		libunibilium.so:devel/unibilium \
 		libutf8proc.so:textproc/utf8proc \
 		libuv.so:devel/libuv \
 		libvterm.so:devel/libvterm
 RUN_DEPENDS=	${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
 TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		cmake cpe gettext iconv lua:51,build luajit \
 		pathfix pkgconfig
 
 USE_GITHUB=	yes
-GH_TUPLE=	tree-sitter:tree-sitter-c:v0.23.5:treesitter_c \
-		tree-sitter-grammars:tree-sitter-lua:v0.3.0:treesitter_lua \
-		tree-sitter-grammars:tree-sitter-markdown:v0.4.1:treesitter_markdown \
-		tree-sitter-grammars:tree-sitter-query:v0.5.1:treesitter_query \
-		tree-sitter-grammars:tree-sitter-vim:v0.5.0:treesitter_vim \
-		neovim:tree-sitter-vimdoc:v3.0.1:treesitter_vimdoc
+GH_TUPLE=	tree-sitter:tree-sitter-c:v0.24.1:treesitter_c \
+		tree-sitter-grammars:tree-sitter-lua:v0.4.0:treesitter_lua \
+		tree-sitter-grammars:tree-sitter-markdown:v0.5.0:treesitter_markdown \
+		tree-sitter-grammars:tree-sitter-query:v0.6.1:treesitter_query \
+		tree-sitter-grammars:tree-sitter-vim:v0.6.0:treesitter_vim \
+		neovim:tree-sitter-vimdoc:v4.0.0:treesitter_vimdoc
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}" \
 		-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib/lua/${LUA_VER}"
 
 CFLAGS+=	-I${LOCALBASE}/include
 
 DATADIR=	${PREFIX}/share/nvim
 PORTSCOUT=	limit:^[0-9\.v]+$$
 PORTDATA=	runtime
 
 OPTIONS_DEFINE=	NLS PYNVIM
 OPTIONS_SUB=	yes
 
 PYNVIM_DESC=	Enable support for plugins written in python
 
 NLS_CMAKE_BOOL=		ENABLE_LIBINTL ENABLE_TRANSLATIONS
 
 PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
 PYNVIM_USES=		python:run
 
 post-configure:
 	${MKDIR} ${BUILD_WRKSRC}/.deps/build/src
 	${MV} ${WRKSRC_treesitter_c} ${BUILD_WRKSRC}/.deps/build/src/treesitter_c
 	${MV} ${WRKSRC_treesitter_lua} ${BUILD_WRKSRC}/.deps/build/src/treesitter_lua
 	${MV} ${WRKSRC_treesitter_markdown} ${BUILD_WRKSRC}/.deps/build/src/treesitter_markdown
 	${MV} ${WRKSRC_treesitter_query} ${BUILD_WRKSRC}/.deps/build/src/treesitter_query
 	${MV} ${WRKSRC_treesitter_vim} ${BUILD_WRKSRC}/.deps/build/src/treesitter_vim
 	${MV} ${WRKSRC_treesitter_vimdoc} ${BUILD_WRKSRC}/.deps/build/src/treesitter_vimdoc
 	${MAKE_ENV} ${CMAKE_BIN} -S ${WRKSRC}/cmake.deps -B ${BUILD_WRKSRC}/.deps ${CMAKE_ARGS} \
 		-DUSE_BUNDLED:BOOL=OFF -DUSE_BUNDLED_TS_PARSERS:BOOL=ON \
 		-DUSE_EXISTING_SRC_DIR:BOOL=ON
 
 post-build:
 	${CMAKE_BIN} --build ${BUILD_WRKSRC}/.deps
 
 post-stage:
 	cd ${BUILD_WRKSRC}/.deps/usr/lib/nvim && ${COPYTREE_SHARE} parser ${STAGEDIR}${PREFIX}/lib/nvim
 	${FIND} ${STAGEDIR}${PREFIX}/lib/nvim -name "*.so" -exec ${STRIP_CMD} {} +
 
 do-test:
 	${GMAKE} -C ${WRKSRC} test
 
 .include <bsd.port.mk>
diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
index 703bda15728f..8dcff2434b64 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1745722710
-SHA256 (neovim-neovim-v0.11.1_GH0.tar.gz) = ffe7f9a7633ed895ff6adb1039af7516cd6453715c8889ad844b6fa39c3df443
-SIZE (neovim-neovim-v0.11.1_GH0.tar.gz) = 12907535
-SHA256 (tree-sitter-tree-sitter-c-v0.23.5_GH0.tar.gz) = f7e50412230150ce514efcccb962ff9b452d9f358e0a2c89f2a0a0256c2ec886
-SIZE (tree-sitter-tree-sitter-c-v0.23.5_GH0.tar.gz) = 378339
-SHA256 (tree-sitter-grammars-tree-sitter-lua-v0.3.0_GH0.tar.gz) = a34cc70abfd8d2d4b0fabf01403ea05f848e1a4bc37d8a4bfea7164657b35d31
-SIZE (tree-sitter-grammars-tree-sitter-lua-v0.3.0_GH0.tar.gz) = 62157
-SHA256 (tree-sitter-grammars-tree-sitter-markdown-v0.4.1_GH0.tar.gz) = e0fdb2dca1eb3063940122e1475c9c2b069062a638c95939e374c5427eddee9f
-SIZE (tree-sitter-grammars-tree-sitter-markdown-v0.4.1_GH0.tar.gz) = 419261
-SHA256 (tree-sitter-grammars-tree-sitter-query-v0.5.1_GH0.tar.gz) = fe8c712880a529d454347cd4c58336ac2db22243bae5055bdb5844fb3ea56192
-SIZE (tree-sitter-grammars-tree-sitter-query-v0.5.1_GH0.tar.gz) = 45070
-SHA256 (tree-sitter-grammars-tree-sitter-vim-v0.5.0_GH0.tar.gz) = 90019d12d2da0751c027124f27f5335babf069a050457adaed53693b5e9cf10a
-SIZE (tree-sitter-grammars-tree-sitter-vim-v0.5.0_GH0.tar.gz) = 357652
-SHA256 (neovim-tree-sitter-vimdoc-v3.0.1_GH0.tar.gz) = 76b65e5bee9ff78eb21256619b1995aac4d80f252c19e1c710a4839481ded09e
-SIZE (neovim-tree-sitter-vimdoc-v3.0.1_GH0.tar.gz) = 58427
+TIMESTAMP = 1748622509
+SHA256 (neovim-neovim-v0.11.2_GH0.tar.gz) = 324759a1bcd1a80b32a7eae1516ee761ec3e566d08284a24c4c7ca59079aabfa
+SIZE (neovim-neovim-v0.11.2_GH0.tar.gz) = 12923046
+SHA256 (tree-sitter-tree-sitter-c-v0.24.1_GH0.tar.gz) = 25dd4bb3dec770769a407e0fc803f424ce02c494a56ce95fedc525316dcf9b48
+SIZE (tree-sitter-tree-sitter-c-v0.24.1_GH0.tar.gz) = 379147
+SHA256 (tree-sitter-grammars-tree-sitter-lua-v0.4.0_GH0.tar.gz) = b0977aced4a63bb75f26725787e047b8f5f4a092712c840ea7070765d4049559
+SIZE (tree-sitter-grammars-tree-sitter-lua-v0.4.0_GH0.tar.gz) = 63999
+SHA256 (tree-sitter-grammars-tree-sitter-markdown-v0.5.0_GH0.tar.gz) = 14c2c948ccf0e9b606eec39b09286c59dddf28307849f71b7ce2b1d1ef06937e
+SIZE (tree-sitter-grammars-tree-sitter-markdown-v0.5.0_GH0.tar.gz) = 419516
+SHA256 (tree-sitter-grammars-tree-sitter-query-v0.6.1_GH0.tar.gz) = 18e158092789e4391668760e9ad1b5b4135c8f483d29163912d29e5619518d40
+SIZE (tree-sitter-grammars-tree-sitter-query-v0.6.1_GH0.tar.gz) = 43412
+SHA256 (tree-sitter-grammars-tree-sitter-vim-v0.6.0_GH0.tar.gz) = b36080be8f9ec53d6413447a792985b984b6f89a223ff758f1acfd380b469a74
+SIZE (tree-sitter-grammars-tree-sitter-vim-v0.6.0_GH0.tar.gz) = 361031
+SHA256 (neovim-tree-sitter-vimdoc-v4.0.0_GH0.tar.gz) = 8096794c0f090b2d74b7bff94548ac1be3285b929ec74f839bd9b3ff4f4c6a0b
+SIZE (neovim-tree-sitter-vimdoc-v4.0.0_GH0.tar.gz) = 58862