--- a/Makefile.inc	Mon May 04 16:32:37 2020 +0100
+++ b/Makefile.inc	Tue May 05 17:34:54 2020 +0100
@@ -33,4 +33,5 @@
 SED_SCRIPT=		-e 's:@SCRIPT@:${SCRIPT}:g'
 SED_SYS=		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
 SED_DEFAULT_HOSTNAME=	-e 's:@DEFAULT_HOSTNAME@:${DEFAULT_HOSTNAME}:g'
+SED_CHROOT?=		-e 's:@CHDIR^@::g' -e 's:@CHDIR$$@::g' -e '/@CHDIR@/d'
 SED_PRIVSEP_USER=	-e 's:@PRIVSEP_USER@:${PRIVSEP_USER}:g'

--- a/configure	Mon May 04 16:32:37 2020 +0100
+++ b/configure	Tue May 05 17:34:54 2020 +0100
@@ -583,6 +583,7 @@
 	echo "PRIVSEP_USER?=	$PRIVSEP_USER" >>$CONFIG_MK
 	if [ -n "$PRIVSEP_CHROOT" ]; then
 		echo "PRIVSEP_CHROOT=	$PRIVSEP_CHROOT" >>$CONFIG_MK
+		echo "SED_CHROOT=	-e 's:@CHDIR^@.*@CHDIR\$\$@:default of:g' -e 's:@CHDIR@:.Pa \${PRIVSEP_CHROOT} .:g'" >>$CONFIG_MK
 	fi
 	echo "#ifndef PRIVSEP_USER" >>$CONFIG_H
 	echo "#define PRIVSEP_USER		 \"$PRIVSEP_USER\"" >>$CONFIG_H

--- a/src/Makefile	Mon May 04 16:32:37 2020 +0100
+++ b/src/Makefile	Tue May 05 17:34:54 2020 +0100
@@ -42,7 +42,8 @@
 	${SED} ${SED_RUNDIR} ${SED_DBDIR} ${SED_LIBDIR} ${SED_HOOKDIR} \
 		${SED_SYS} ${SED_SCRIPT} ${SED_DATADIR} \
 		${SED_SERVICEEXISTS} ${SED_SERVICECMD} ${SED_SERVICESTATUS} \
-		${SED_STATUSARG} ${SED_PRIVSEP_USER} \
+		${SED_STATUSARG} \
+		${SED_CHROOT} ${SED_PRIVSEP_USER} \
 		$< > $@
 
 all: ${TOP}/config.h ${PROG} ${SCRIPTS} ${MAN5} ${MAN8}

--- a/src/dhcpcd.8.in	Mon May 04 16:32:37 2020 +0100
+++ b/src/dhcpcd.8.in	Tue May 05 17:34:54 2020 +0100
@@ -267,8 +267,10 @@
 .Xr chroot 3
 to the
 .Ar chroot
-directory rather than the privilege separation users home directory.
-The privilege sepatation user is @PRIVSEP_USER@.
+directory rather than the
+@CHDIR^@privilege separation users home directory.@CHDIR$@
+@CHDIR@
+The privilege separation user is @PRIVSEP_USER@.
 .It Fl D , Fl Fl duid
 Use a DHCP Unique Identifier.
 If a system UUID is available, that will be used to create a DUID-UUID,