diff --git a/devel/py-hunter/Makefile b/devel/py-hunter/Makefile
index 1852f571e292..0ff10e4943cd 100644
--- a/devel/py-hunter/Makefile
+++ b/devel/py-hunter/Makefile
@@ -1,27 +1,26 @@
 PORTNAME=	hunter
-DISTVERSION=	3.5.1
-PORTREVISION=	1
+DISTVERSION=	3.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Flexible code tracing toolkit
 WWW=		https://github.com/ionelmc/python-hunter
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=30.3.0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.3.1:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 cython autoplist pytest # tests fail to run, see https://github.com/ionelmc/python-hunter/issues/114
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/devel/py-hunter/distinfo b/devel/py-hunter/distinfo
index 896a62491b44..9b77302f9fc6 100644
--- a/devel/py-hunter/distinfo
+++ b/devel/py-hunter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675631477
-SHA256 (hunter-3.5.1.tar.gz) = cdf094a5f3c85b1f95bb9d4f508d505225984ae03fc1ad9c364866584b1dbc95
-SIZE (hunter-3.5.1.tar.gz) = 561530
+TIMESTAMP = 1682577735
+SHA256 (hunter-3.6.0.tar.gz) = 88a4599aa58a02e8b3c2c48d4a3f690d32ab2876a08aa4721b4c2f47f548c0a7
+SIZE (hunter-3.6.0.tar.gz) = 644129
diff --git a/devel/py-hunter/files/patch-pyproject.toml b/devel/py-hunter/files/patch-pyproject.toml
new file mode 100644
index 000000000000..f7abe2f37aeb
--- /dev/null
+++ b/devel/py-hunter/files/patch-pyproject.toml
@@ -0,0 +1,10 @@
+--- pyproject.toml.orig	2023-04-27 06:43:19 UTC
++++ pyproject.toml
+@@ -1,6 +1,6 @@
+ [build-system]
+ requires = [
+-    "setuptools>=64.0.0",
++    "setuptools",
+     "wheel",
+     "setuptools_scm>=3.3.1,!=4.0.0",
+ ]