diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 9c1edbfc20..3e07aff6a0 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -18,7 +18,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.6
+BUILD_VERSION=2.8.7-rc2
 BUILD_TAG=HEAD
 
 
diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 7e5fb24fed..9def44e364 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -79,6 +79,19 @@ cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts
 chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $APPDIR/distrib/scripts/create_archives.sh --all
 
+#rebake the bakefiles for os2
+if [ $rebake = "yes" ]; then
+  if [ ! -d $WX_SRC_DIR/build/bakefiles ]; then
+       mkdir $WX_SRC_DIR/build/bakefiles
+  fi
+	 
+  cd $WX_SRC_DIR/build/bakefiles
+   rm .ba*
+   bakefile_gen  -f watcom -d ../os2/Bakefiles.os2.bkgen
+fi
+		     
+$APPDIR/distrib/scripts/create_archives.sh --wxos2
+
 # 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