--- /usr/local/share/poudriere/common.sh.orig	2023-08-20 19:50:03.357222000 +0000
+++ /usr/local/share/poudriere/common.sh	2023-08-20 19:19:26.922453000 +0000
@@ -2010,6 +2010,9 @@
 	fi
 
 	mount -t devfs devfs ${mnt}/dev
+	if [ -z "${NOLINUX-}" ] && [ -d "${mnt}/compat" ]; then
+		ln -sf ${mnt}/dev "${mnt}/compat/linux/"
+	fi
 	if [ ${JAILED} -eq 0 ]; then
 		devfs -m ${mnt}/dev rule apply hide
 		for p in ${devfspath} ; do
--- /usr/local/share/poudriere/testport.sh.orig	2023-08-20 19:50:30.658745000 +0000
+++ /usr/local/share/poudriere/testport.sh	2023-08-20 19:16:29.798894000 +0000
@@ -298,7 +298,7 @@
 [ "${PREFIX}" != "${LOCALBASE}" ] && PORT_FLAGS="PREFIX=${PREFIX}"
 msg "Building with flags: ${PORT_FLAGS}"
 
-if [ -d ${MASTERMNT}${PREFIX} -a "${PREFIX}" != "/usr" ]; then
+if [ -d ${MASTERMNT}${PREFIX} -a "${PREFIX}" != "/usr" -a "${PREFIX}" != "/compat/linux" ]; then
 	msg "Removing existing ${PREFIX}"
 	[ "${PREFIX}" != "${LOCALBASE}" ] && rm -rf ${MASTERMNT}${PREFIX}
 fi