diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index afbace54c235..af0d1699b6ae 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -1,23 +1,23 @@
 # Created by: jessekempf@gmail.com
 
 PORTNAME=	daemon
-PORTVERSION=	2.0.6
+PORTVERSION=	2.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-daemon-${PORTVERSION}
 
 MAINTAINER=	jessekempf@gmail.com
 COMMENT=	Well-behaved daemon framework for Python
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${PY_FLAVOR}
 
-NO_ARCH=	yes
-USE_PYTHON=	autoplist concurrent distutils
 USES=		python:3.6+
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-daemon/distinfo b/devel/py-daemon/distinfo
index 084ea355d6fc..70e5766b54da 100644
--- a/devel/py-daemon/distinfo
+++ b/devel/py-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python-daemon-2.0.6.tar.gz) = 1730b8e80773379857bf4a792ccccea2cda05c151fbee986b909ceddafa27309
-SIZE (python-daemon-2.0.6.tar.gz) = 72668
+TIMESTAMP = 1618323536
+SHA256 (python-daemon-2.3.0.tar.gz) = bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf
+SIZE (python-daemon-2.3.0.tar.gz) = 82831
diff --git a/devel/py-daemon/files/patch-setup.py b/devel/py-daemon/files/patch-setup.py
new file mode 100644
index 000000000000..cc41192ecf23
--- /dev/null
+++ b/devel/py-daemon/files/patch-setup.py
@@ -0,0 +1,22 @@
+--- setup.py.orig	2021-04-14 13:08:50.055448000 +0200
++++ setup.py	2021-04-14 13:12:54.776586000 +0200
+@@ -67,7 +67,6 @@
+         zip_safe=False,
+         setup_requires=[
+             "docutils",
+-            "twine",
+             ],
+         test_suite="setup.test_suite",
+         tests_require=test_requirements,
+@@ -98,11 +97,6 @@
+             "Topic :: Software Development :: Libraries :: Python Modules",
+             ],
+         )
+-
+-# Docutils is only required for building, but Setuptools can't distinguish
+-# dependencies properly.
+-# See <URL:https://github.com/pypa/setuptools/issues/457>.
+-setup_kwargs['install_requires'].append("docutils")
+ 
+ 
+ if __name__ == '__main__':