diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 080589ba2c..223de79366 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.7.0-rc
+BUILD_VERSION=2.7.1-rc
 BUILD_TAG=HEAD
 
 
diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 630bd70fe1..41f6988314 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -48,6 +48,10 @@ fi
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
   cd $WX_SRC_DIR/build/bakefiles
+  # always rebuild the bakefiles to avoid conflicts with cvs
+  ## 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