diff --git a/sysutils/vm-bhyve-devel/Makefile b/sysutils/vm-bhyve-devel/Makefile
index ca0665bd2bfe..5c3ff37833a4 100644
--- a/sysutils/vm-bhyve-devel/Makefile
+++ b/sysutils/vm-bhyve-devel/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=		vm-bhyve
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.6.2-15
 DISTVERSIONSUFFIX=	-gd5b493a
 CATEGORIES=		sysutils
 PKGNAMESUFFIX=		-devel
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Management system for bhyve virtual machines
-WWW=		https://github.com/churchers/vm-bhyve
+WWW=		https://github.com/freebsd/vm-bhyve
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	churchers
+GH_ACCOUNT=	freebsd
 
 CONFLICTS_INSTALL=	vm-bhyve
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		BHYVE_FIRMWARE EXAMPLES GRUB2_BHYVE TMUX
 BHYVE_FIRMWARE_DESC=	Required to run UEFI guests
 EXAMPLES_DESC=		Install example guest templates
 GRUB2_BHYVE_DESC=	Required to run Linux or any other guests that need a Grub bootloader
 TMUX_DESC=		Tmux console access instead of cu/nmdm
 
 BHYVE_FIRMWARE_RUN_DEPENDS=	bhyve-firmware>0:sysutils/bhyve-firmware
 GRUB2_BHYVE_RUN_DEPENDS=	grub2-bhyve>0:sysutils/grub2-bhyve
 TMUX_RUN_DEPENDS=		tmux:sysutils/tmux
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vm ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm ${STAGEDIR}${PREFIX}/etc/rc.d
 	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/vm-bhyve)
 	(cd ${WRKSRC}/sample-templates/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_MAN} ${WRKSRC}/vm.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/vm-bhyve-devel/distinfo b/sysutils/vm-bhyve-devel/distinfo
index 1abd98a093ff..d5640922decb 100644
--- a/sysutils/vm-bhyve-devel/distinfo
+++ b/sysutils/vm-bhyve-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739525548
-SHA256 (churchers-vm-bhyve-v1.6.2-15-gd5b493a_GH0.tar.gz) = 60197e6f39b56325c8d28fa0c561e58c4b99087b6214b1661c6cd79e849f9adc
-SIZE (churchers-vm-bhyve-v1.6.2-15-gd5b493a_GH0.tar.gz) = 76932
+TIMESTAMP = 1752062424
+SHA256 (freebsd-vm-bhyve-v1.6.2-15-gd5b493a_GH0.tar.gz) = 60197e6f39b56325c8d28fa0c561e58c4b99087b6214b1661c6cd79e849f9adc
+SIZE (freebsd-vm-bhyve-v1.6.2-15-gd5b493a_GH0.tar.gz) = 76932