diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index bfdeed4cc8..83b3873ee2 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -7,20 +7,23 @@
 # to remote hosts
 STAGING_DIR=./BUILD
 
-# directory storing the final build files
-DIST_DIR=../deliver
-
 # directory to store the wx tree we pull from CVS
 WX_TEMP_DIR=/tmp/wx-temp
+SCRIPTDIR=`dirname $0`
+WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
+WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
+# don't make this a subdir of wxWidgets... (or tar will bite recursively)
+DIST_DIR=${WX_TEMP_DIR}/deliver
 
+echo "temp dir is $WX_TEMP_DIR"
+echo script dir is $SCRIPTDIR
 CURDATE=`date -I`
 
 # build info
 BUILD_VERSION=2.9.0
 BUILD_TAG=HEAD
 
-
 if [ "$KIND" = "release" ]; then
    FTPDIR=/home/ftp/pub/${BUILD_VERSION}
 else
diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 9e5532234d..64a8f852bc 100755
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,7 +20,7 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
-##SCRIPTDIR=$WXWIN/distrib/scripts
+
 . $SCRIPTDIR/utils.inc
 
 MANIFESTDIR=$WXWIN/distrib/scripts/manifests
@@ -160,11 +160,11 @@ dospinport(){
         popd
     fi
     echo "Creating wx$portname-$VERSION.zip..."
-    zip $ZIPFLAGS -r -9 $APPDIR/deliver/wx$portname-$VERSION.zip .
+    zip $ZIPFLAGS -r -9 $DIST_DIR/wx$portname-$VERSION.zip .
     echo "Creating wx$portname-$VERSION.tar.gz..."
-    tar czf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wx$portname-$VERSION
+    tar czf $DIST_DIR/wx$portname-$VERSION.tar.gz wx$portname-$VERSION
     echo "Creating wx$portname-$VERSION.tar.bz2..."
-    tar ch wx$portname-$VERSION | bzip2 -f9 > $APPDIR/deliver/wx$portname-$VERSION.tar.bz2
+    tar ch wx$portname-$VERSION | bzip2 -f9 > $DIST_DIR//wx$portname-$VERSION.tar.bz2
     popd
     rm -rf /tmp/wx$port
     rm ${portfiles}
diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 1a80a7cf49..fa9a17506a 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -5,31 +5,20 @@ if [ "$VERSION" = "" ]; then
     . `dirname $0`/build-environ.cfg
 fi 
 
-echo "temp dir is $WX_TEMP_DIR"
-START_DIR="$PWD"
-echo "start dir is $START_DIR"
-
-SCRIPTDIR=${START_DIR}/scripts
-WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
-WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
-
-CURDATE=`date -I`
-
 # first, grab the latest revision with specified tag
 if [ ! -d $WX_TEMP_DIR ]; then
   mkdir $WX_TEMP_DIR
 fi 
 
-cd $WX_TEMP_DIR
-
 # just do an update if we started a build but it failed somewhere
 if [ ! -d $WX_WEB_DIR ]; then  
+  cd $WX_TEMP_DIR
   cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
   echo "Grabbing wxWebSite sources..."
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
 else
     cd $WX_WEB_DIR
-    cvs update -d -P
+####    cvs update -d -P
 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
@@ -39,17 +28,15 @@ if [ ! -d $WX_SRC_DIR ]; then
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
   cd $WX_SRC_DIR
 else
-    cd $WX_SRC_DIR
-    cvs update -d -P
+  cd $WX_SRC_DIR
+####  cvs update -d -P
 fi
-#copy setup0.h setup.h for msw
-rm include/wx/msw/setup.h
-cp include/wx/msw/setup0.h include/wx/msw/setup.h
 
 # this is where we will store the wxAll tarball we create
-if [ ! -d $START_DIR/$DISTDIR ]; then
-  mkdir -p $START_DIR/$DISTDIR
+if [ ! -d $DIST_DIR ]; then
+  mkdir -p $DIST_DIR
 fi
+echo saving to $DIST_DIR
 
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
@@ -62,46 +49,34 @@ if [ $rebake = "yes" ]; then
   ## better to not use unix2dos on the wxWidgets tree so we don't get the conflicts
   ##fix this -B gave an option not recognised  error (sf bug 1537221)...
   rm .ba*
-  bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen
-fi
-
-cd $WX_SRC_DIR
-if [ ! -d $WX_SRC_DIR/deliver ]; then
-  mkdir $WX_SRC_DIR/deliver
+#####  bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen
 fi
 
 # Now generate the mega tarball with everything. We will push this to our build machines.
-
 cd $WX_TEMP_DIR
 export APPDIR=$WX_TEMP_DIR/wxWidgets
 export WXWIN=$WX_TEMP_DIR/wxWidgets
 export VERSION=$BUILD_VERSION
 export SCRIPTDIR=${SCRIPTDIR}
+export DIST_DIR=${DIST_DIR}
 
 #remove old files
 rm -rf $APPDIR/deliver/*
-rm -rf $START_DIR/$DIST_DIR/*
+rm -rf $DIST_DIR/*
 
+tar czf $DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR
 
-tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR
-
-#export DESTDIR=$STAGING_DIR
 cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts
 chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $APPDIR/distrib/scripts/create_archives.sh --all
 
-# copy all the archives we created to the master machine's deliver directory
-cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR
-cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
-cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR
-
-echo "Tarballs located at: $START_DIR/$DIST_DIR"
+echo "Tarballs located at: $DIST_DIR"
 
 if [ ! -f $WX_TARBALL ]; then
   echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue."
   exit 1
 else
-  cd $START_DIR
+  cd $DIST_DIR
   #cp $WX_TARBALL $STAGING_DIR
   #cp -r $WX_WEB_DIR $STAGING_DIR
   
@@ -111,7 +86,7 @@ fi
 if [ "$KIND" = "daily" ]; then
    ##delete old files and then copy new ones, add a symlink
    find ${FTPDIR}/files -type f -name wx\* -mtime +6 | xargs rm -rf
-   cp  $START_DIR/$DIST_DIR/wx* ${FTPDIR}/files
+   cp  $DIST_DIR/wx* ${FTPDIR}/files
 
    rm -f ${FTPDIR}/wx* ${FTPDIR}/MD5SUM
    for f in `find ${FTPDIR}/files -type f -name wx\* -mmin -601` ; do
@@ -122,20 +97,20 @@ else
    ##get install.txt files etc
    ##.../docs/plat/install.txt goes to install-plat-2.7.0.txt
    ## wince has a file down one dir
-   cp ${DOCDIR}/changes.txt $START_DIR/$DIST_DIR/changes-${BUILD_VERSION}.txt
+   cp ${DOCDIR}/changes.txt $DIST_DIR/changes-${BUILD_VERSION}.txt
 
    for f in `find ${DOCDIR} -name install.txt` ; do
-     cp $f $START_DIR/$DIST_DIR/install-`echo $f | sed -e "s|${DOCDIR}||g" | sed -e "s|/install.txt||g"`-${BUILD_VERSION}.txt
+     cp $f $DIST_DIR/install-`echo $f | sed -e "s|${DOCDIR}||g" | sed -e "s|/install.txt||g"`-${BUILD_VERSION}.txt
    done
 
    for g in `find ${DOCDIR} -name readme.txt` ; do
-     cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
+     cp $g $DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
    done
    # Rename double readme
-   mv $START_DIR/$DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
+   mv $DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $DIST_DIR/readme-${BUILD_VERSION}.txt
    ## copy files ...
    mkdir ${FTPDIR}/
-   cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/
+   cp  $DIST_DIR/* ${FTPDIR}/
 
 fi