diff --git a/Makefile.inc1 b/Makefile.inc1
index 9ab06edd1fb3..c0ef145d2e97 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -747,7 +747,7 @@ buildworld_epilogue:
 # to quote multiword values.
 #
 buildenvvars:
-	@echo ${WMAKEENV:Q}
+	@echo ${WMAKEENV:Q} ${.MAKE.EXPORTED:@v@$v=\"${$v}\"@}
 
 .if ${.TARGETS:Mbuildenv}
 .if ${.MAKEFLAGS:M-j}