diff --git a/devel/py-jupyterlab/Makefile b/devel/py-jupyterlab/Makefile
index fcca3fa57800..ec96eefb0d3d 100644
--- a/devel/py-jupyterlab/Makefile
+++ b/devel/py-jupyterlab/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	jupyterlab
-PORTVERSION=	3.5.3
+PORTVERSION=	3.6.2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JupyterLab server extension
-WWW=		https://jupyter.org/
+WWW=		https://jupyter.org/ \
+		https://github.com/jupyterlab/jupyterlab
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -16,11 +17,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>=0:devel/py-jupyter-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-server>=1.16.0<3:devel/py-jupyter-server@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jupyterlab-server>=2.10<3:devel/py-jupyterlab-server@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jupyter-server-ydoc>=0.8.0<0.9:devel/py-jupyter-server-ydoc@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jupyter-ydoc>=0.2.3<0.4.0:devel/py-jupyter-ydoc@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jupyterlab-server>=2.19<3:devel/py-jupyterlab-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbclassic>=0:devel/py-nbclassic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notebook>=0<7:www/py-notebook@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=6.1.0:www/py-tornado@${PY_FLAVOR}
 
 USES=		python:3.7+
@@ -28,4 +30,10 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-jupyterlab/distinfo b/devel/py-jupyterlab/distinfo
index be58feb2b7cb..101b3377c79f 100644
--- a/devel/py-jupyterlab/distinfo
+++ b/devel/py-jupyterlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675191021
-SHA256 (jupyterlab-3.5.3.tar.gz) = 51e889448ae194eeef8e50f63f5c4f487f728f477befe436e9749672f7511dbe
-SIZE (jupyterlab-3.5.3.tar.gz) = 17114007
+TIMESTAMP = 1679498694
+SHA256 (jupyterlab-3.6.2.tar.gz) = e55bc40c36c2a52b76cf301138507a5488eb769137dd39d9f31a6259a00c6b03
+SIZE (jupyterlab-3.6.2.tar.gz) = 16846937
diff --git a/devel/py-jupyterlab/files/patch-setup.cfg b/devel/py-jupyterlab/files/patch-setup.cfg
new file mode 100644
index 000000000000..3bb5471b3905
--- /dev/null
+++ b/devel/py-jupyterlab/files/patch-setup.cfg
@@ -0,0 +1,11 @@
+--- setup.cfg.orig	2023-03-20 10:51:04 UTC
++++ setup.cfg
+@@ -38,7 +38,7 @@ install_requires = 
+ 	jupyter_core
+ 	jupyterlab_server~=2.19
+ 	jupyter_server>=1.16.0,<3
+-	jupyter_ydoc~=0.2.3
++	jupyter_ydoc>=0.2.3,<0.4.0
+ 	jupyter_server_ydoc~=0.8.0
+ 	nbclassic
+ 	notebook<7
diff --git a/devel/py-jupyterlab/pkg-descr b/devel/py-jupyterlab/pkg-descr
index 6bbcbc906f64..67ba8e6dfa15 100644
--- a/devel/py-jupyterlab/pkg-descr
+++ b/devel/py-jupyterlab/pkg-descr
@@ -9,5 +9,3 @@ Notebook.
 
 The current JupyterLab releases are suitable for general usage, and the
 extension APIs will continue to evolve for JupyterLab extension developers.
-
-See also: https://github.com/jupyterlab/jupyterlab