diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index 062bc57b7b35..215a512ad71c 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	poudriere
 DISTVERSION=	3.3.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-devel-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	BASH CERTS DIALOG4PORTS EXAMPLES QEMU ZSH
 OPTIONS_DEFAULT=BASH CERTS DIALOG4PORTS ZSH
 OPTIONS_SUB=	yes
 
 CERTS_DESC=		Install checksum and SSL certificates for jail creation
 CERTS_RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
 CERTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
 DIALOG4PORTS_DESC=	Install dialog4ports for options command
 DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
 
 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:
 	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
 	    ${WRKSRC}/poudriere
 	${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.*
 
 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/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67
new file mode 100644
index 000000000000..892ab3d338ae
--- /dev/null
+++ b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67
@@ -0,0 +1,24 @@
+commit 8bfaa898b32370bbfff9bf37fc833d7abc4b8b67
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Sat Aug 28 11:57:56 2021 -0700
+
+    distclean: Fix reading make.conf
+    
+    Fixes #910
+    Fixes fa0308152e6 ("Move make.conf ports_env handling to its own not-spammy file")
+    
+    (cherry picked from commit 95971acb6ffd51b2432a38efd1111dd189f68edd)
+
+diff --git src/share/poudriere/distclean.sh src/share/poudriere/distclean.sh
+index 08889f1dd..f77163fc4 100755
+--- src/share/poudriere/distclean.sh
++++ src/share/poudriere/distclean.sh
+@@ -144,7 +144,7 @@ for PTNAME in ${PTNAMES}; do
+ 
+ 	__MAKE_CONF=$(mktemp -t poudriere-make.conf)
+ 	export __MAKE_CONF
+-	setup_ports_env "/" "${__MAKE_CONF}"
++	setup_ports_env "" "${__MAKE_CONF}"
+ 	if [ -z "${NO_PACKAGE_BUILDING}" ]; then
+ 		echo "BATCH=yes"
+ 		echo "PACKAGE_BUILDING=yes"