diff --git a/devel/luv/Makefile b/devel/luv/Makefile
index d4823eb8b3a1..cba39bbd4659 100644
--- a/devel/luv/Makefile
+++ b/devel/luv/Makefile
@@ -1,51 +1,67 @@
 PORTNAME=	luv
 DISTVERSION=	1.41.0-0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	checo1705@secmail.pro
 COMMENT=	libuv bindings for lua
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libuv.so:devel/libuv \
-		libluajit-5.1.so:lang/luajit-openresty \
+LIB_DEPENDS=	libuv.so:devel/libuv
 
 USES=		cmake
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	luvit keplerproject:compat
 GH_PROJECT=	luv lua-compat-5.3:compat
 GH_TAGNAME=	bc91f40:compat
 GH_SUBDIR=	deps/lua-compat-5.3:compat
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES LUAJIT
+OPTIONS_DEFAULT_aarch64=	LUAJIT
+OPTIONS_DEFAULT_amd64=		LUAJIT
+OPTIONS_DEFAULT_i386=		LUAJIT
+OPTIONS_DEFAULT_powerpc=	LUAJIT
+OPTIONS_DEFAULT_powerpc64=	LUAJIT
+OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 
-CMAKE_ON=	BUILD_SHARED_LIBS WITH_LUA_ENGINE=LuaJIT WITH_SHARED_LIBUV
+LUAJIT_DESC=	Use LuaJIT (instead of just Lua; recommended)
+LUAJIT_LIB_DEPENDS=	${LUAJIT_LIB_DEPENDS_${ARCH}}
+LUAJIT_LIB_DEPENDS_aarch64=	libluajit-5.1.so:lang/luajit-openresty
+LUAJIT_LIB_DEPENDS_amd64=	libluajit-5.1.so:lang/luajit
+LUAJIT_LIB_DEPENDS_i386=	libluajit-5.1.so:lang/luajit
+LUAJIT_LIB_DEPENDS_powerpc=	libluajit-5.1.so:lang/luajit
+LUAJIT_LIB_DEPENDS_powerpc64=	libluajit-5.1.so:lang/luajit-openresty
+LUAJIT_LIB_DEPENDS_powerpc64le=	libluajit-5.1.so:lang/luajit-openresty
+LUAJIT_CMAKE_ON=	-DWITH_LUA_ENGINE=LuaJIT
+LUAJIT_CMAKE_OFF=	-DWITH_LUA_ENGINE=Lua
+LUAJIT_USES_OFF=	lua
+CMAKE_ON=	BUILD_SHARED_LIBS WITH_SHARED_LIBUV
 CMAKE_OFF=	BUILD_MODULE
 CMAKE_ARGS=	-DLUA_BUILD_TYPE=System \
 		-DLUA_COMPAT53_DIR=deps/lua-compat-5.3
 
 PLIST_FILES=	lib/libluv.so \
 		lib/libluv.so.1 \
 		lib/libluv.so.1.41.0 \
 		libdata/pkgconfig/libluv.pc \
 		include/luv/util.h \
 		include/luv/luv.h \
 		include/luv/lreq.h \
 		include/luv/lhandle.h
 
 PORTDOCS=	docs.md
 
 PORTEXAMPLES=	*
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs.md ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index ab04cd1b5627..1888e9cfa09f 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,77 +1,88 @@
 # Created by: Anton Tornqvist <antont@inbox.lv>
 
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
+PORTREVISION=	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=	libluajit-5.1.so:lang/luajit-openresty \
-		libluv.so:devel/luv \
+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 lua:build pathfix pkgconfig
+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=	NLS PYNVIM
+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: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
 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>