diff --git a/Makefile.inc1 b/Makefile.inc1
index 4cd51195c81b..ce622cf1e8da 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -140,9 +140,7 @@ STRICTTMPPATH=	${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 OBJFORMAT_PATH?=	/usr/libexec
 
-TMPDIR?=	/tmp
-TMPPID!=	echo $$$$
-INSTALLTMP=	${TMPDIR}/install.${TMPPID}
+INSTALLTMP!=	mktemp -d -u -t install
 
 #
 # Building a world goes through the following stages