diff --git c/editors/neovim/Makefile w/editors/neovim/Makefile
index 21ec54eef933..9e760f64517f 100644
--- c/editors/neovim/Makefile
+++ w/editors/neovim/Makefile
@@ -1,64 +1,75 @@
 # Created by: Anton Tornqvist <antont@inbox.lv>
 # $FreeBSD$
 
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.5
 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_MODLIBDIR}/lpeg.so:devel/lua-lpeg
-LIB_DEPENDS=	libluajit-5.1.so:lang/luajit \
-		libmsgpackc.so:devel/msgpack \
+LIB_DEPENDS=	libmsgpackc.so:devel/msgpack \
 		libtermkey.so:devel/libtermkey \
 		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 iconv lua:build pathfix pkgconfig
+USES=		cmake iconv pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.7:libmpack_lua
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}"
 
-OPTIONS_DEFINE=	NLS PYNVIM
-OPTIONS_SUB=	yes
-NLS_CMAKE_BOOL=	ENABLE_LIBINTL
-NLS_USES=	gettext
-PYNVIM_DESC=	Enable support for plugins written in python
-PYNVIM_USES=	python:run
-PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
+OPTIONS_DEFINE=			LUAJIT NLS PYNVIM
+OPTIONS_DEFAULT_amd64=		LUAJIT
+OPTIONS_DEFAULT_i386=		LUAJIT
+OPTIONS_EXCLUDE_aarch64=	LUAJIT
+OPTIONS_EXCLUDE_mips64=		LUAJIT
+OPTIONS_EXCLUDE_powerpc64=	LUAJIT
+OPTIONS_EXCLUDE_riscv=		LUAJIT
+OPTIONS_EXCLUDE_sparc64=	LUAJIT
+OPTIONS_SUB=			yes
+LUAJIT_DESC=			Use lang/luajit for running Lua code
+LUAJIT_USES_OFF=		lua:52
+LUAJIT_CMAKE_OFF=		-DPREFER_LUA:BOOL="ON"
+LUAJIT_USES=			lua:build
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
+NLS_CMAKE_BOOL=			ENABLE_LIBINTL
+NLS_USES=			gettext
+PYNVIM_DESC=			Enable support for plugins written in python
+PYNVIM_USES=			python:run
+PYNVIM_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
 
 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 c/editors/neovim/files/patch-cmake_FindLua.cmake w/editors/neovim/files/patch-cmake_FindLua.cmake
new file mode 100644
index 000000000000..3a4a8d287ab2
--- /dev/null
+++ w/editors/neovim/files/patch-cmake_FindLua.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindLua.cmake.orig	2019-05-23 17:11:51 UTC
++++ cmake/FindLua.cmake
+@@ -42,7 +42,7 @@ unset(_lua_append_versions)
+ 
+ # this is a function only to have all the variables inside go away automatically
+ function(_lua_set_version_vars)
+-    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
++    set(LUA_VERSIONS5 5.2 5.1 5.0)
+ 
+     if (Lua_FIND_VERSION_EXACT)
+         if (Lua_FIND_VERSION_COUNT GREATER 1)