diff --git a/sysutils/pot/Makefile b/sysutils/pot/Makefile
index af783a6b7514..e56b16e32403 100644
--- a/sysutils/pot/Makefile
+++ b/sysutils/pot/Makefile
@@ -1,76 +1,74 @@
 PORTNAME=	pot
-DISTVERSION=	0.15.6
+DISTVERSION=	0.16.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Container framework for FreeBSD
-WWW=		https://github.com/pizzamig/pot/
+WWW=		https://github.com/bsdpot/pot/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	potnet:sysutils/potnet \
+RUN_DEPENDS=	freebsd-release-manifests>0:misc/freebsd-release-manifests \
 		ncat:security/nmap \
-		freebsd-release-manifests>0:misc/freebsd-release-manifests \
+		potnet>=0.5.0:sysutils/potnet \
 		signify:security/signify
 TEST_DEPENDS=	flock:sysutils/flock
 
-GROUPS=		pot
-
+USE_GITHUB=	yes
+GH_ACCOUNT=	bsdpot
 USE_RC_SUBR=	pot pot_early
 
-SUB_FILES=	pkg-message pot.8
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	pizzamig
 NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	pkg-message pot.8
 
-OPTIONS_DEFINE=	DOCS ZSH
+TEST_WRKSRC=	${WRKSRC}/tests
 
-ZSH_DESC=	Zsh Autocompletion support
+GROUPS=		pot
 
-OPTIONS_DEFAULT=	ZSH
-OPTIONS_SUB=	yes
+PORTDOCS=	*
 
-TEST_WRKSRC=	${WRKSRC}/tests
+OPTIONS_DEFINE=		DOCS ZSH
+OPTIONS_DEFAULT=	ZSH
+OPTIONS_SUB=		yes
 
-PORTDOCS=	*
+ZSH_DESC=	Zsh Autocompletion support
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/pot \
 	    ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	( cd ${WRKSRC}/share/pot && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/flavours
 	${INSTALL_DATA} ${WRKSRC}/etc/pot/pot.default.conf \
 		${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/pot/pot.conf.sample \
 		${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/pot/flavours/dns.sh \
 		${STAGEDIR}${ETCDIR}/flavours
 	${INSTALL_DATA} ${WRKSRC}/etc/pot/flavours/dns \
 		${STAGEDIR}${ETCDIR}/flavours
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/pot/flavours/fbsd-update.sh \
 		${STAGEDIR}${ETCDIR}/flavours
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/pot/flavours/slim.sh \
 		${STAGEDIR}${ETCDIR}/flavours
 	${INSTALL_MAN} ${WRKDIR}/pot.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 do-install-ZSH-on:
 	( cd ${WRKSRC}/share/zsh && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/zsh)
 
-do-test:
-	( cd ${TEST_WRKSRC} && ./test-suite.sh )
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/share/doc/pot/Installation.md \
 		${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/share/doc/pot/QuickStart.md \
 		${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/share/doc/pot/Images.md \
 		${STAGEDIR}${DOCSDIR}/
 
+do-test:
+	( cd ${TEST_WRKSRC} && ./test-suite.sh )
+
 .include <bsd.port.mk>
diff --git a/sysutils/pot/distinfo b/sysutils/pot/distinfo
index 7563aa2489b6..33fea03a4181 100644
--- a/sysutils/pot/distinfo
+++ b/sysutils/pot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696001780
-SHA256 (pizzamig-pot-0.15.6_GH0.tar.gz) = 61badb8bd45ff5615a6ceffb6a4e44f1b7c24a970bfd637e4e330ce440805fc1
-SIZE (pizzamig-pot-0.15.6_GH0.tar.gz) = 176667
+TIMESTAMP = 1703963587
+SHA256 (bsdpot-pot-0.16.0_GH0.tar.gz) = 09f115e4a90871055bf19167202109db049e775eee7cc7d54f5cfcd5945dc40a
+SIZE (bsdpot-pot-0.16.0_GH0.tar.gz) = 178160