diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 7e2cffcb03e3..c48981a236a5 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.5
+PORTREVISION=	1
 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 \
 		libmsgpack-c.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 gettext 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" \
+		-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}"
 CFLAGS+=	-I${LOCALBASE}/include
 
 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
 PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
 PYNVIM_USES=		python:run
 
 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/pkg-plist b/editors/neovim/pkg-plist
index 81c6f78cc5b7..4a26bab98363 100644
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
@@ -1,35 +1,35 @@
 bin/nvim
-man/man1/nvim.1.gz
+share/man/man1/nvim.1.gz
 share/applications/nvim.desktop
 share/icons/hicolor/128x128/apps/nvim.png
 %%NLS%%share/locale/af/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/cs.cp1250/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/da/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/de/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/es/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/it/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ja.euc-jp/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ko.UTF-8/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/no/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/pl.UTF-8/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/sk.cp1250/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/zh_CN.UTF-8/LC_MESSAGES/nvim.mo
 %%NLS%%share/locale/zh_TW.UTF-8/LC_MESSAGES/nvim.mo
 @dir lib/nvim