diff --git a/net/py-zeroconf/Makefile b/net/py-zeroconf/Makefile
index 53aab342a3d9..ecc2c85829fd 100644
--- a/net/py-zeroconf/Makefile
+++ b/net/py-zeroconf/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	zeroconf
-PORTVERSION=	0.132.2
+PORTVERSION=	0.39.4
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Pure python implementation of multicast DNS service discovery
-WWW=		https://github.com/python-zeroconf/python-zeroconf
+WWW=		https://github.com/jstasiak/python-zeroconf
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ifaddr>=0.1.7:net/py-ifaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}async_timeout>=4.0.1:devel/py-async_timeout@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pep8-naming>=0.12.0:devel/py-pep8-naming@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}poetry>=1.8.0:devel/py-poetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>=8.0.0:devel/py-pytest@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ifaddr>=0.1.7:net/py-ifaddr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0.1:devel/py-async_timeout@${PY_FLAVOR}
 
-USES=		python cargo
-USE_PYTHON=	autoplist concurrent distutils pep517 pytest
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
-GH_ACCOUNT=	python-zeroconf
+GH_ACCOUNT=	jstasiak
 GH_PROJECT=	python-zeroconf
 
 NO_ARCH=	yes
 TEST_TARGET=	test
 
+pre-test:
+	${REINPLACE_CMD} -e 's|nosetests|nosetests-${PYTHON_VER} --exclude=test_lots_of_names|g' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/net/py-zeroconf/distinfo b/net/py-zeroconf/distinfo
index ca097f6baf25..e60840f85730 100644
--- a/net/py-zeroconf/distinfo
+++ b/net/py-zeroconf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719677309
-SHA256 (python-zeroconf-python-zeroconf-0.132.2_GH0.tar.gz) = a0188086e1806d19bf49f797b25a1eba9b14e60422931188af287a98b304b80e
-SIZE (python-zeroconf-python-zeroconf-0.132.2_GH0.tar.gz) = 184339
+TIMESTAMP = 1670020710
+SHA256 (jstasiak-python-zeroconf-0.39.4_GH0.tar.gz) = 32783c9a583419abe7223ba199e2ddebe9533011caecf6a268852e0fbea1186a
+SIZE (jstasiak-python-zeroconf-0.39.4_GH0.tar.gz) = 137174
diff --git a/net/py-zeroconf/files/patch-Makefile b/net/py-zeroconf/files/patch-Makefile
deleted file mode 100644
index c8142d918f53..000000000000
--- a/net/py-zeroconf/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	2024-04-13 00:41:48 UTC
-+++ Makefile
-@@ -2,4 +2,4 @@ test:
- 
- 
- test:
--	poetry run pytest --durations=20 --timeout=60 -v tests
-+	poetry run pytest tests
diff --git a/net/py-zeroconf/files/patch-pyproject.toml b/net/py-zeroconf/files/patch-pyproject.toml
deleted file mode 100644
index 085f2173f72e..000000000000
--- a/net/py-zeroconf/files/patch-pyproject.toml
+++ /dev/null
@@ -1,10 +0,0 @@
---- pyproject.toml.orig	2024-06-29 09:11:31.605531000 -0700
-+++ pyproject.toml	2024-06-29 09:11:56.996337000 -0700
-@@ -102,7 +102,6 @@
- 
- 
- [tool.pytest.ini_options]
--addopts = "-v -Wdefault --cov=zeroconf --cov-report=term-missing:skip-covered"
- pythonpath = ["src"]
- 
- [tool.coverage.run]