diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script
--- a/usr.sbin/bsdinstall/scripts/script
+++ b/usr.sbin/bsdinstall/scripts/script
@@ -88,10 +88,12 @@
 f_dprintf "Began Installation at %s" "$( date )"
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
+rm -rf $TMPDIR/bsdinstall-installscript-*
 
 split -a 2 -p '^#!.*' "$SCRIPT" $TMPDIR/bsdinstall-installscript-
 
-. $TMPDIR/bsdinstall-installscript-aa
+mv $TMPDIR/bsdinstall-installscript-aa $TMPDIR/bsdinstall-installscript-options
+. $TMPDIR/bsdinstall-installscript-options
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
 
@@ -159,7 +161,7 @@
 
 # Run post-install script
 if [ -f $TMPDIR/bsdinstall-installscript-ab ]; then
-	cp $TMPDIR/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript
+	cat $TMPDIR/bsdinstall-installscript-?? >$BSDINSTALL_CHROOT/tmp/installscript
 	chmod a+x $BSDINSTALL_CHROOT/tmp/installscript
 	chroot $BSDINSTALL_CHROOT /tmp/installscript $@ 2>&1
 	rm $BSDINSTALL_CHROOT/tmp/installscript