diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 6389238e68..8b36b3fbe8 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -11,13 +11,13 @@ STAGING_DIR=./BUILD
 DIST_DIR=../deliver
 
 # directory to store the wx tree we pull from CVS
-WX_TEMP_DIR=/tmp/wx-temp
+WX_TEMP_DIR=/tmp/wx-temp28
 DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.4
+BUILD_VERSION=2.8.5-rc1
 BUILD_TAG=HEAD
 
 
@@ -26,7 +26,7 @@ if [ "$KIND" = "release" ]; then
 else
    KIND=daily
    BUILD_VERSION=${CURDATE}
-   FTPDIR=/home/ftp/pub/CVS_HEAD/v2
+   FTPDIR=/home/ftp/pub/28_Branch/v2
 fi
 
 echo "Building for ${BUILD_VERSION}"
diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 9a06962bb7..406f9aa728 100755
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -209,7 +209,7 @@ prepareforrelease()
     cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt
 
     # Now delete a few files that are unnecessary
-    rm -f BuildCVS.txt descrip.mms
+    rm -f BuildSVN.txt descrip.mms
     rm -f setup.h_vms
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
     rm -f -r contrib/docs/latex/ogl
diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 66dc24d192..040a95d0ed 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -9,7 +9,6 @@ echo "temp dir is $WX_TEMP_DIR"
 
 START_DIR="$PWD"
 SCRIPTDIR=${START_DIR}/scripts
-WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 
 CURDATE=`date -I`
@@ -21,25 +20,15 @@ fi
 
 cd $WX_TEMP_DIR
 
-# just do an update if we started a build but it failed somewhere
-if [ ! -d $WX_WEB_DIR ]; then  
-  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
-fi
 
 if [ ! -d $WX_SRC_DIR ]; then
   cd $WX_TEMP_DIR
-  cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
   echo "Grabbing wx CVS with tag $BUILD_TAG"
-  cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
+  svn up https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH/ wxWidgets
   cd $WX_SRC_DIR
 else
     cd $WX_SRC_DIR
-    cvs update -d -P
+    svn up
 fi
 #copy setup0.h setup.h for msw
 rm include/wx/msw/setup.h
@@ -81,8 +70,8 @@ export SCRIPTDIR=${SCRIPTDIR}
 rm -rf $APPDIR/deliver/*
 rm -rf $START_DIR/$DIST_DIR/*
 
-
-tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR
+# no general tarball for 2.8 branch
+#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