Index: scripts/docsinstall
===================================================================
--- scripts/docsinstall	(revision 224732)
+++ scripts/docsinstall	(working copy)
@@ -28,6 +28,7 @@
 
 
 exec 3>&1
+[ ! -z  $1 ] && export PACKAGEROOT=$1 
 DOCS=$(dialog --backtitle "FreeBSD Installer" \
     --title "FreeBSD Documentation Installation" --separate-output \
     --checklist "This menu will allow you to install the whole documentation set
Index: scripts/auto
===================================================================
--- scripts/auto	(revision 224732)
+++ scripts/auto	(working copy)
@@ -83,13 +83,16 @@
 
 if [ -n "$FETCH_DISTRIBUTIONS" ]; then
 	exec 3>&1
-	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
+	BSDINSTALL_DISTSITES=$(`dirname $0`/mirrorselect 2>&1 1>&3)
 	MIRROR_BUTTON=$?
 	exec 3>&-
 	test $MIRROR_BUTTON -eq 0 || error
+	BSDINSTALL_DISTSITE=${BSDINSTALL_DISTSITES#* }
+	PKG_MIRROR=${BSDINSTALL_DISTSITES% *}
 	export BSDINSTALL_DISTSITE
+	export PKG_MIRROR
+
 fi
-
 rm $PATH_FSTAB
 touch $PATH_FSTAB
 
@@ -197,7 +200,7 @@
 		finalconfig
 		;;
 	"Handbook")
-		bsdinstall docsinstall
+		bsdinstall docsinstall $PKG_MIRROR
 		finalconfig
 		;;
 	"Shell")
Index: scripts/mirrorselect
===================================================================
--- scripts/mirrorselect	(revision 224732)
+++ scripts/mirrorselect	(working copy)
@@ -212,4 +212,4 @@
 esac
 
 export BSDINSTALL_DISTSITE
-echo $BSDINSTALL_DISTSITE >&2
+echo $BSDINSTALL_DISTSITE $MIRROR>&2