diff --git a/ports-mgmt/freebsd-bugzilla-cli/Makefile b/ports-mgmt/freebsd-bugzilla-cli/Makefile
index aadae853748e..c0e0001e8932 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/Makefile
+++ b/ports-mgmt/freebsd-bugzilla-cli/Makefile
@@ -1,41 +1,31 @@
 PORTNAME=	freebsd-bugzilla-cli
 PORTVERSION=	0.15.1
 PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Interact with the FreeBSD bugzilla instance
-WWW=		https://github.com/p6m7g8/__p6-freebsd-bugzilla
+WWW=		https://github.com/p6m7g8-archive/p6-freebsd-bugzilla
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
+RUN_DEPENDS=	bugz:devel/pybugz \
+		ca_root_nss>=0:security/ca_root_nss
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 DATADIR=	${PREFIX}/share/bz
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	p6m7g8
-GH_PROJECT=	__p6-freebsd-bugzilla
+GH_ACCOUNT=	p6m7g8-archive
+GH_PROJECT=	p6-freebsd-bugzilla
 GH_TAGNAME=	e76c8b1
 
-OPTIONS_GROUP=	BACKEND
-OPTIONS_GROUP_BACKEND=	PYBUGZ
-OPTIONS_DEFAULT=PYBUGZ
-OPTIONS_SUB=	yes
-PYBUGZ_DESC=	Use devel/pybugz for bugzilla interface
-
-PYBUGZ_RUN_DEPENDS=	bugz:devel/pybugz
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/bz ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/share/bz/*.sh ${STAGEDIR}${DATADIR}/
-
-do-install-PYBUGZ-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/pybugz/
+	${INSTALL_SCRIPT} ${WRKSRC}/share/bz/*.sh ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/share/bz/pybugz/*.sh ${STAGEDIR}${DATADIR}/pybugz/
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/freebsd-bugzilla-cli/distinfo b/ports-mgmt/freebsd-bugzilla-cli/distinfo
index bd59761b0f81..e4f31344a5aa 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/distinfo
+++ b/ports-mgmt/freebsd-bugzilla-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731679172
-SHA256 (p6m7g8-__p6-freebsd-bugzilla-0.15.1-e76c8b1_GH0.tar.gz) = 5f00802580513d2ed78158b76805d3b3e8df9eff1ab3810d2d3f57c935f9f8dc
-SIZE (p6m7g8-__p6-freebsd-bugzilla-0.15.1-e76c8b1_GH0.tar.gz) = 15765
+TIMESTAMP = 1767157591
+SHA256 (p6m7g8-archive-p6-freebsd-bugzilla-0.15.1-e76c8b1_GH0.tar.gz) = b575c09921f7f0a8a4b0d0853f21aede76b024b1524937cf8879ad95c737553a
+SIZE (p6m7g8-archive-p6-freebsd-bugzilla-0.15.1-e76c8b1_GH0.tar.gz) = 15769
diff --git a/ports-mgmt/freebsd-bugzilla-cli/pkg-plist b/ports-mgmt/freebsd-bugzilla-cli/pkg-plist
index 835fa01f373b..7b74be2143c8 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/pkg-plist
+++ b/ports-mgmt/freebsd-bugzilla-cli/pkg-plist
@@ -1,37 +1,37 @@
 bin/bz
 %%DATADIR%%/_util.sh
 %%DATADIR%%/_version.sh
 %%DATADIR%%/attach.sh
 %%DATADIR%%/claim.sh
 %%DATADIR%%/close.sh
 %%DATADIR%%/comment.sh
 %%DATADIR%%/edit.sh
 %%DATADIR%%/get.sh
 %%DATADIR%%/help.sh
 %%DATADIR%%/init.sh
 %%DATADIR%%/inprog.sh
 %%DATADIR%%/login.sh
 %%DATADIR%%/overto.sh
 %%DATADIR%%/patch.sh
 %%DATADIR%%/port_commit.sh
 %%DATADIR%%/port_submit.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/close.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/comment.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/edit.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/get.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/init.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/inprog.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/login.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/overto.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/search.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/submit.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/take.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/timeout.sh
-%%PYBUGZ%%%%DATADIR%%/pybugz/top.sh
+%%DATADIR%%/pybugz/close.sh
+%%DATADIR%%/pybugz/comment.sh
+%%DATADIR%%/pybugz/edit.sh
+%%DATADIR%%/pybugz/get.sh
+%%DATADIR%%/pybugz/init.sh
+%%DATADIR%%/pybugz/inprog.sh
+%%DATADIR%%/pybugz/login.sh
+%%DATADIR%%/pybugz/overto.sh
+%%DATADIR%%/pybugz/search.sh
+%%DATADIR%%/pybugz/submit.sh
+%%DATADIR%%/pybugz/take.sh
+%%DATADIR%%/pybugz/timeout.sh
+%%DATADIR%%/pybugz/top.sh
 %%DATADIR%%/search.sh
 %%DATADIR%%/show.sh
 %%DATADIR%%/src_submit.sh
 %%DATADIR%%/take.sh
 %%DATADIR%%/timeout.sh
 %%DATADIR%%/top.sh
 %%DATADIR%%/version.sh