diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index b665d6f1659f..c90474274515 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,91 +1,90 @@
 # Created by: Anton Tornqvist <antont@inbox.lv>
 
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
-PORTREVISION=	1
+DISTVERSION=	0.6.1
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Next-generation Vim
 
 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 \
 		libtermkey.so:devel/libtermkey \
 		libtree-sitter.so:devel/tree-sitter \
 		libunibilium.so:devel/unibilium \
 		libuv.so:devel/libuv \
 		libvterm.so:devel/libvterm
 TEST_DEPENDS=	autoconf>=0:devel/autoconf \
 		aclocal:devel/automake \
 		gmake:devel/gmake \
 		libtool:devel/libtool
 
 USES=		cmake cpe iconv pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.7: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=	LUAJIT NLS PYNVIM
 OPTIONS_DEFAULT=LUAJIT
 OPTIONS_EXCLUDE_aarch64=	LUAJIT
 OPTIONS_EXCLUDE_mips64=		LUAJIT
 OPTIONS_EXCLUDE_riscv64=	LUAJIT
 OPTIONS_EXCLUDE_sparc64=	LUAJIT
 OPTIONS_SUB=	yes
 
 LUAJIT_DESC=	Use LuaJIT for faster Lua code (recommended)
 PYNVIM_DESC=	Enable support for plugins written in python
 
 LUAJIT_CMAKE_OFF=	-DPREFER_LUA:BOOL="ON"
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES=		lua:52,build
 LUAJIT_USES_OFF=	lua:52
 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:Mpowerpc64*}
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 .endif
 
 .if ${ARCH} == powerpc64
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|lua_objlen|lua_rawlen| ; \
 		 s|luaL_reg |luaL_Reg | ; \
 		 s|luaL_register(L, NULL, \(.*\));|luaL_setfuncs(L, \1, 0);|' \
 		${WRKSRC_libmpack_lua}/lmpack.c
 
 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 2a9b354679c0..e0a63612d5a0 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1638413905
-SHA256 (neovim-neovim-v0.6.0_GH0.tar.gz) = 2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c
-SIZE (neovim-neovim-v0.6.0_GH0.tar.gz) = 10592213
+TIMESTAMP = 1640983334
+SHA256 (neovim-neovim-v0.6.1_GH0.tar.gz) = dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864
+SIZE (neovim-neovim-v0.6.1_GH0.tar.gz) = 10597584
 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.7_GH0.tar.gz) = 2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a
 SIZE (libmpack-libmpack-lua-1.0.7_GH0.tar.gz) = 15606