diff --git a/devel/py-nbclient/Makefile b/devel/py-nbclient/Makefile
index 0813a1336495..d4d772e648ca 100644
--- a/devel/py-nbclient/Makefile
+++ b/devel/py-nbclient/Makefile
@@ -1,31 +1,31 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	nbclient
-PORTVERSION=	0.5.4
+PORTVERSION=	0.5.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Client library for executing notebooks
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-client>=6.1.5:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nest-asyncio>=0:devel/py-nest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30700
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-nbclient/distinfo b/devel/py-nbclient/distinfo
index f0e63218cdb4..9adf28582f7d 100644
--- a/devel/py-nbclient/distinfo
+++ b/devel/py-nbclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632037102
-SHA256 (nbclient-0.5.4.tar.gz) = 6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce
-SIZE (nbclient-0.5.4.tar.gz) = 70209
+TIMESTAMP = 1637072974
+SHA256 (nbclient-0.5.6.tar.gz) = 069228da9642a5d43fcabe8b78fcf2b7e8b62c71e07d772208e4f0b38b718474
+SIZE (nbclient-0.5.6.tar.gz) = 73729
diff --git a/devel/py-nbclient/files/patch-setup.py b/devel/py-nbclient/files/patch-setup.py
new file mode 100644
index 000000000000..77664e9f3134
--- /dev/null
+++ b/devel/py-nbclient/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig	2021-11-12 08:00:52 UTC
++++ setup.py
+@@ -57,12 +57,6 @@ setup(
+     python_requires=">=3.6.1",
+     install_requires=requirements,
+     extras_require=extras_require,
+-    entry_points={
+-        'console_scripts': [
+-            'jupyter-run = nbclient.cli:run',
+-            'jupyter-execute = nbclient.cli:execute',
+-        ],
+-    },
+     project_urls={
+         'Documentation': 'https://nbclient.readthedocs.io',
+         'Funding': 'https://numfocus.org/',