diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 30956dde8861..020e7de435ae 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,71 +1,71 @@
 
 PORTNAME=	poudriere
 DISTVERSION=	3.3.99.20210303
-PORTREVISION=	1
+PORTREVISION=	2
 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
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	3.3.0-542-g8bf6e594a
 
 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:
 	${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-1c9357d08e35f2bb248533ce043b2e61920ebf9e b/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e
new file mode 100644
index 000000000000..487e88c71f87
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e
@@ -0,0 +1,29 @@
+commit 1c9357d08e35f2bb248533ce043b2e61920ebf9e
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Tue Mar 23 16:06:36 2021 -0700
+
+    Partially revert #844 for createfs; still use -p.
+    
+    This restores the -p and atime/mountpoint/compression setting
+    for /jails and /ports.
+    
+    It changes compression=lz4 to compression=on as well.
+    
+    Fixes #844
+
+diff --git src/share/poudriere/include/fs.sh src/share/poudriere/include/fs.sh
+index fed4a5b08..cad0aa69d 100644
+--- src/share/poudriere/include/fs.sh
++++ src/share/poudriere/include/fs.sh
+@@ -34,7 +34,10 @@ createfs() {
+ 
+ 	if [ -n "${fs}" -a "${fs}" != "none" ]; then
+ 		msg_n "Creating ${name} fs at ${mnt}..."
+-		if ! zfs create ${fs}; then
++		if ! zfs create -p \
++			-o compression=on \
++			-o atime=off \
++			-o mountpoint=${mnt} ${fs}; then
+ 			echo " fail"
+ 			err 1 "Failed to create FS ${fs}"
+ 		fi