diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index 41643eab47a6..b7d1f3870193 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.4.5
+DISTREVISION=	1
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 WWW=		https://www.spyder-ide.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.2.0:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.6.0:devel/py-cookiecutter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=20181111:textproc/py-diff-match-patch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.17.2:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0.7:devel/py-jellyfish@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>=17.0.0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6.0:textproc/py-numpydoc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-venv>=3.0.2:devel/py-pylint-venv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-black>=1.2.0:textproc/py-python-lsp-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyls-spyder>=0.4.0:textproc/py-pyls-spyder@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qt5-webengine>0:www/py-qt5-webengine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-server>=1.7.4:textproc/py-python-lsp-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.26:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.2.1:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qtconsole>=5.4.0:devel/py-qtconsole@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0.6.6:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.4:devel/py-spyder-kernels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR}
 
 USES=		desktop-file-utils python pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	pyqt5 sip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	spyder-ide
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PYTHON_SITELIBDIR}/spyder
 
 post-extract: # remove bundled dependencies
 	@${RM} -r ${WRKSRC}/external-deps/*
 
 .include <bsd.port.mk>
diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml
new file mode 100644
index 000000000000..f15e2837199e
--- /dev/null
+++ b/devel/spyder/files/patch-binder_environment.yml
@@ -0,0 +1,11 @@
+--- binder/environment.yml.orig	2023-08-29 21:53:14 UTC
++++ binder/environment.yml
+@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0
+ - pyqt <5.16
+ - pyqtwebengine <5.16
+ - python-lsp-black >=1.2.0,<3.0.0
+-- python-lsp-server >=1.7.4,<1.8.0
++- python-lsp-server >=1.7.4
+ - pyxdg >=0.26
+ - pyzmq >=22.1.0
+ - qdarkstyle >=3.0.2,<3.2.0
diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml
new file mode 100644
index 000000000000..170dc060dfd9
--- /dev/null
+++ b/devel/spyder/files/patch-requirements_main.yml
@@ -0,0 +1,11 @@
+--- requirements/main.yml.orig	2023-08-29 21:53:14 UTC
++++ requirements/main.yml
+@@ -29,7 +29,7 @@ dependencies:
+   - pyqt <5.16
+   - pyqtwebengine <5.16
+   - python-lsp-black >=1.2.0,<3.0.0
+-  - python-lsp-server >=1.7.4,<1.8.0
++  - python-lsp-server >=1.7.4
+   - pyzmq >=22.1.0
+   - qdarkstyle >=3.0.2,<3.2.0
+   - qstylizer >=0.2.2
diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py
index fed581da4710..c16ad328da5e 100644
--- a/devel/spyder/files/patch-setup.py
+++ b/devel/spyder/files/patch-setup.py
@@ -1,19 +1,28 @@
---- setup.py.orig	2023-04-05 02:35:28 UTC
+--- setup.py.orig	2023-08-29 21:53:14 UTC
 +++ setup.py
 @@ -91,7 +91,7 @@ def get_data_files():
      """
      Return data_files in a platform dependent manner.
      """
 -    if sys.platform.startswith('linux'):
 +    if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
          data_files = [('share/applications', ['scripts/spyder.desktop']),
                        ('share/icons', ['img_src/spyder.png']),
                        ('share/metainfo',
 @@ -197,7 +197,6 @@ setup_args = dict(
          'Topic :: Scientific/Engineering',
          'Topic :: Software Development :: Widget Sets',
      ],
 -    cmdclass=CMDCLASS,
  )
  
  
+@@ -229,7 +228,7 @@ install_requires = [
+     'pyls-spyder>=0.4.0',
+     'pyqt5<5.16',
+     'pyqtwebengine<5.16',
+-    'python-lsp-server[all]>=1.7.4,<1.8.0',
++    'python-lsp-server[all]>=1.7.4',
+     'pyxdg>=0.26;platform_system=="Linux"',
+     'pyzmq>=22.1.0',
+     'qdarkstyle>=3.0.2,<3.2.0',
diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py
new file mode 100644
index 000000000000..74ab905ef64c
--- /dev/null
+++ b/devel/spyder/files/patch-spyder_dependencies.py
@@ -0,0 +1,11 @@
+--- spyder/dependencies.py.orig	2023-08-29 21:53:14 UTC
++++ spyder/dependencies.py
+@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2'
+ PYGMENTS_REQVER = '>=2.0'
+ PYLINT_REQVER = '>=2.5.0,<3.0'
+ PYLINT_VENV_REQVER = '>=3.0.2'
+-PYLSP_REQVER = '>=1.7.4,<1.8.0'
++PYLSP_REQVER = '>=1.7.4'
+ PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
+ PYLS_SPYDER_REQVER = '>=0.4.0'
+ PYXDG_REQVER = '>=0.26'