diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index c59921b92b76..c7aa54e0af63 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 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
 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/files/patch-sshdconfig-UseBlacklist b/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim
similarity index 59%
rename from editors/neovim/files/patch-sshdconfig-UseBlacklist
rename to editors/neovim/files/patch-runtime_syntax_sshdconfig.vim
index 7523d1feb39c..add09834c402 100644
--- a/editors/neovim/files/patch-sshdconfig-UseBlacklist
+++ b/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim
@@ -1,10 +1,16 @@
+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,7 @@ syn keyword sshdconfigKeyword Subsystem
+@@ -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