diff --git a/www/py-woob/Makefile b/www/py-woob/Makefile
index 6430125aa262..861c534e0323 100644
--- a/www/py-woob/Makefile
+++ b/www/py-woob/Makefile
@@ -1,54 +1,66 @@
 PORTNAME=	woob
-PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Web Outside of Browsers
 WWW=		https://woob.tech/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=23.0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=63.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=23.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PY_PILLOW} \
+		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
 		wget:ftp/wget \
 		gpg2:security/gnupg \
 		yt-dlp:www/yt-dlp
 
-USES=		python:3.7+
-USE_PYTHON=	autoplist distutils
+USES=		python:3.7+ shebangfix
+USE_PYTHON=	autoplist pep517
+SHEBANG_FILES=	woob/applications/main/main.py
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		CLICOLOR NSS RTMPDUMP
 OPTIONS_DEFAULT=	CLICOLOR NSS
 
 CLICOLOR_DESC=		Color command line interface
 CLICOLOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}
 
 NSS_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 			${PYTHON_PKGNAMEPREFIX}python-nss>0:security/py-python-nss@${PY_FLAVOR}
 
 RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/woob/browser/nss.py
 
 .include <bsd.port.mk>
diff --git a/www/py-woob/distinfo b/www/py-woob/distinfo
index 22078ec3f1db..8a072a258dee 100644
--- a/www/py-woob/distinfo
+++ b/www/py-woob/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677631332
-SHA256 (woob-3.3.1.tar.gz) = 9d8b0ee0d3d357fc8a01e78b80a64b87c5cb0cc8c5ea8bb82f5831296f73dc6b
-SIZE (woob-3.3.1.tar.gz) = 1057157
+TIMESTAMP = 1683147637
+SHA256 (woob-3.5.tar.gz) = 2fd14125cca51ffbdf9a9bd32a7a1f7e8241e5a264b732e7e4ca1b4358734d9d
+SIZE (woob-3.5.tar.gz) = 345036
diff --git a/www/py-woob/files/patch-setup.py b/www/py-woob/files/patch-setup.py
deleted file mode 100644
index aed574c2686f..000000000000
--- a/www/py-woob/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
-Exclude test files from being installed.
-PR: 269003
-
---- setup.py.orig	2022-12-20 10:22:03 UTC
-+++ setup.py
-@@ -29,7 +29,7 @@ from setuptools import find_packages, setup
- 
- 
- def install_woob():
--    packages = set(find_packages(exclude=['modules', 'modules.*']))
-+    packages = set(find_packages(exclude=['modules', 'modules.*', 'tests', 'tests.*']))
- 
-     data_files = [
-         ('share/man/man1', glob.glob('man/*')),