Index: head/editors/py-pynvim/Makefile
===================================================================
--- head/editors/py-pynvim/Makefile	(revision 538275)
+++ head/editors/py-pynvim/Makefile	(revision 538276)
@@ -1,39 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	pynvim
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.1
 CATEGORIES=	editors python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-PATCH_SITES=	https://github.com/neovim/pynvim/commit/
-PATCHFILES=	f04853121de564ac03b981a984595ea33331ad3e.patch:-p1
-
 MAINTAINER=	tm@NetBSD.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}
 
 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}
 
 maintainer-test:
 # Cannot depend on neovim as it could create a circular dependency
 	@${ECHO_CMD} "===> Install neovim, then run:"
 	@${ECHO_CMD} "cd ${WRKSRC} && ${PYTHON_CMD} -m pytest"
 
 .include <bsd.port.mk>
Index: head/editors/py-pynvim/distinfo
===================================================================
--- head/editors/py-pynvim/distinfo	(revision 538275)
+++ head/editors/py-pynvim/distinfo	(revision 538276)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1584174678
-SHA256 (neovim-pynvim-0.4.0_GH0.tar.gz) = 6d48f194e5102cbc2043bf78647cfdea77bdb2b545fe942c20bbc6c58f489210
-SIZE (neovim-pynvim-0.4.0_GH0.tar.gz) = 53443
-SHA256 (f04853121de564ac03b981a984595ea33331ad3e.patch) = a57209d8dbbbc952a191c454e8e10508d1057926f06f27acfca06e020b79414a
-SIZE (f04853121de564ac03b981a984595ea33331ad3e.patch) = 1094
+TIMESTAMP = 1590965199
+SHA256 (pynvim-0.4.1.tar.gz) = 55e918d664654cfa1c9889d3dbe7c63e9f338df5d49471663f78d54c85e84c58
+SIZE (pynvim-0.4.1.tar.gz) = 41939