Index: head/editors/Makefile
===================================================================
--- head/editors/Makefile
+++ head/editors/Makefile
@@ -214,6 +214,7 @@
     SUBDIR += psgml
     SUBDIR += puff
     SUBDIR += py-editorconfig
+    SUBDIR += py-pynvim
     SUBDIR += py-room
     SUBDIR += rox-edit
     SUBDIR += rubygem-neovim
Index: head/editors/py-pynvim/Makefile
===================================================================
--- head/editors/py-pynvim/Makefile
+++ head/editors/py-pynvim/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	pynvim
+PORTVERSION=	0.3.2
+CATEGORIES=	editors python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	0mp@FreeBSD.org
+COMMENT=	Python client and plugin host for Neovim
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR}
+py27_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}trollius>=0:devel/py-trollius@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.4.0:devel/py-pytest@${PY_FLAVOR} \
+		nvim:editors/neovim
+
+USES=		python
+USE_PYTHON=	concurrent distutils flavors autoplist
+# XXX: Switch to CHEESESHOP once https://github.com/neovim/pynvim/issues/367
+# is resolved.
+USE_GITHUB=	yes
+GH_ACCOUNT=	neovim
+
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
+		SUFFIX_FOR_PYTHON_3=${PYTHON_MAJOR_VER:M3}
+
+do-test:
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
+
+.include <bsd.port.mk>
Index: head/editors/py-pynvim/distinfo
===================================================================
--- head/editors/py-pynvim/distinfo
+++ head/editors/py-pynvim/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1552658562
+SHA256 (neovim-pynvim-0.3.2_GH0.tar.gz) = 0a44c540dd5790acfbc7e411b0ed4fb6c44914d866226ebebf370c24c2723dc2
+SIZE (neovim-pynvim-0.3.2_GH0.tar.gz) = 51954
Index: head/editors/py-pynvim/files/pkg-message.in
===================================================================
--- head/editors/py-pynvim/files/pkg-message.in
+++ head/editors/py-pynvim/files/pkg-message.in
@@ -0,0 +1,7 @@
+In order to use pynvim in Neovim it is required to specify add the following line
+to ~/.config/nvim/init.vim:
+
+let g:python%%SUFFIX_FOR_PYTHON_3%%_host_prog='%%PYTHON_CMD%%'
+
+See Neovim Wiki for more information:
+https://github.com/neovim/neovim/wiki/Installing-Neovim
Index: head/editors/py-pynvim/pkg-descr
===================================================================
--- head/editors/py-pynvim/pkg-descr
+++ head/editors/py-pynvim/pkg-descr
@@ -0,0 +1,5 @@
+Pynvim implements support for python plugins in Nvim. It also works as a
+library for connecting to and scripting Nvim processes through its msgpack-rpc
+API.
+
+WWW: https://pynvim.readthedocs.io/en/latest/