diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 8115d53cd85b..b32a47902b9c 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	poudriere
 DISTVERSION=	3.3.99.20220831
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 WWW=		https://github.com/freebsd/poudriere/wiki
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	3.3.0-1135-g137c376a8
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH
 OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
 OPTIONS_SUB=	yes
 
 MANIFESTS_DESC=		Install manifests for jail creation
 MANIFESTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
 PORTCONFIG_DESC=	Install portconfig for options command
 PORTCONFIG_RUN_DEPENDS=	portconfig>0:ports-mgmt/portconfig
 
 QEMU_DESC=	Add qemu-user-static for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 .include <bsd.port.options.mk>
 
 # rm -x support came in 10.0.  A bundled rm is used if not supported in base.
 # While <10 is technically not supported in the Ports Tree, Poudriere
 # detects this and it being a package build tool it should still be
 # supported as a user may be installing this to build packages for upgrading
 # their system to a supported release.
 .if ${OSVERSION} < 1000000
 PLIST_SUB+=	RM=""
 .else
 PLIST_SUB+=	RM="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
 	    ${WRKSRC}/src/bin/poudriere.in
 
 post-install:
 	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
 	    ${STAGEDIR}${DATADIR}/MANIFESTS
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	${INSTALL_DATA} ${WRKSRC}/completions/bash/poudriere \
 	    ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/poudriere-devel/files/patch-portconfig b/ports-mgmt/poudriere-devel/files/patch-portconfig
index 723ffd38cf69..ef7d75cc1471 100644
--- a/ports-mgmt/poudriere-devel/files/patch-portconfig
+++ b/ports-mgmt/poudriere-devel/files/patch-portconfig
@@ -1,28 +1,43 @@
 diff --git src/share/poudriere/options.sh src/share/poudriere/options.sh
 index 745c20d8..51a9aff9 100755
 --- src/share/poudriere/options.sh
 +++ src/share/poudriere/options.sh
 @@ -155,7 +155,13 @@ fi
  export PORTSDIR=`pget ${PTNAME} mnt`
  [ -d "${PORTSDIR}/ports" ] && PORTSDIR="${PORTSDIR}/ports"
  [ -z "${PORTSDIR}" ] && err 1 "No such ports tree: ${PTNAME}"
 -command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use this command."
 +if command -v portconfig >/dev/null 2>&1; then
 +	d4p=portconfig
 +elif command -v dialog4ports >/dev/null 2>&1; then
 +	d4p=dialog4ports
 +else
 +	err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use this command."
 +fi
  
  read_packages_from_params "$@"
  
 @@ -205,7 +211,7 @@ for originspec in $(listed_ports show_moved); do
  		env ${flavor:+FLAVOR=${flavor}} \
  		make PORT_DBDIR=${PORT_DBDIR} \
  			PKG_BIN=`which pkg-static` \
 -			DIALOG4PORTS=`which dialog4ports` \
 +			DIALOG4PORTS=`which $d4p` \
  			LOCALBASE=/nonexistent \
  			-C ${PORTSDIR}/${origin} \
  			${RECURSE_COMMAND}
+diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh
+index 07b788310..c684a3d27 100755
+--- src/share/poudriere/testport.sh
++++ src/share/poudriere/testport.sh
+@@ -231,7 +231,9 @@ injail /usr/bin/make -C ${portdir} maintainer ECHO_CMD=true || \
+     err 1 "Port is broken"
+ 
+ if [ $CONFIGSTR -eq 1 ]; then
+-	command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use -c."
++	command -v portconfig >/dev/null 2>&1 || \
++	    command -v dialog4ports >/dev/null 2>&1 || \
++	    err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use -c."
+ 	__MAKE_CONF=$(mktemp -t poudriere-make.conf)
+ 	setup_makeconf "${__MAKE_CONF}" "${JAILNAME}" "${PTNAME}" "${SETNAME}"
+ 	PORTSDIR=${portsdir} \