Index: usr.sbin/bsdinstall/scripts/docsinstall
===================================================================
--- usr.sbin/bsdinstall/scripts/docsinstall
+++ usr.sbin/bsdinstall/scripts/docsinstall
@@ -151,13 +151,20 @@
 # Let pkg_add be able to use name servers
 f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/
 
+if [ ! -x $BSDINSTALL_CHROOT ]; then
+	ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg bootstrap
+fi
+
 #
 # Install each of the selected packages
 #
+docsets=""
 for lang in $selected; do
-	f_package_add $lang-freebsd-doc || return $FAILURE
+	docsets="$docsets $lang-freebsd-doc"
 done
 
+ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg install $docsets || return $FAILURE
+
 ################################################################################
 # END
 ################################################################################