diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index fc2823afebdf..fab85bf40c07 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -1,59 +1,62 @@
 PORTNAME=	bugwarrior
-PORTVERSION=	1.8.0
-PORTREVISION=	2
+DISTVERSION=	2.0.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Sync issue & bug tracking systems with taskwarrior
-WWW=		https://github.com/ralphbean/bugwarrior
+WWW=		https://github.com/GothenburgBitFactory/bugwarrior
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-DEPRECATED=		Broken for more than 6 months
-EXPIRATION_DATE=	2025-12-31
-BROKEN=		python-3.9 or later is not supported
-
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>0:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
+OPTIONS_DEFINE=	BUGZILLA GENERAL JIRA KEYRING PHABRICATOR SERVICES TRAC
 OPTIONS_DEFAULT=	BUGZILLA JIRA KEYRING PHABRICATOR TRAC
 OPTIONS_GROUP=		GENERAL SERVICES
 OPTIONS_GROUP_GENERAL=	KEYRING
 OPTIONS_GROUP_SERVICES=	BUGZILLA JIRA PHABRICATOR TRAC
 
 BUGZILLA_DESC=		Enable Bugzilla support
 GENERAL_DESC=		General Options
 JIRA_DESC=		Enabla Atlassian Jira support
 KEYRING_DESC=		Enable keyring (password) support
 PHABRICATOR_DESC=	Enable Phabricator support
 SERVICES_DESC=		Third Party Services
 TRAC_DESC=		Enable Trac support
 
 BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>=2.0.0:devel/py-python-bugzilla@${PY_FLAVOR}
 JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>=0.22:devel/py-jira@${PY_FLAVOR}
 KEYRING_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR}
 PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${PY_FLAVOR}
 TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${PY_FLAVOR}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^license = .*|license = { text = "GPL-3.0-or-later" }|; \
+		/^license-files/d' \
+		${WRKSRC}/pyproject.toml
+
 do-test:
 	${RM} ${WRKSRC}/tests/test_activecollab.py # Needs pandoc
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-bugwarrior/distinfo b/deskutils/py-bugwarrior/distinfo
index 5abe362d2613..38ee27de71a6 100644
--- a/deskutils/py-bugwarrior/distinfo
+++ b/deskutils/py-bugwarrior/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646764381
-SHA256 (bugwarrior-1.8.0.tar.gz) = f024c29d2089b826f05481cace33a62aa984f33e98d226f6e41897e6f11b3f51
-SIZE (bugwarrior-1.8.0.tar.gz) = 125593
+TIMESTAMP = 1764320490
+SHA256 (bugwarrior-2.0.0.tar.gz) = 6e54cab4d7e14d9c891f020eab53fb1e3b4498d9f3fdb2fa756af8d36bde366e
+SIZE (bugwarrior-2.0.0.tar.gz) = 177676
diff --git a/deskutils/py-bugwarrior/files/patch-setup.py b/deskutils/py-bugwarrior/files/patch-setup.py
deleted file mode 100644
index 0ea9584e9f83..000000000000
--- a/deskutils/py-bugwarrior/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2019-05-22 04:44:47 UTC
-+++ setup.py
-@@ -54,6 +54,8 @@ setup(name='bugwarrior',
-           "Mock",
-           "nose",
-           "responses",
-+           "pypandoc",
-+           "pyac",
-           "bugwarrior[jira]",
-           "bugwarrior[megaplan]",
-           "bugwarrior[activecollab]",