diff --git a/README.txt b/README.txt
index bbcfb64a93..31d517f57b 100644
--- a/README.txt
+++ b/README.txt
@@ -13,7 +13,7 @@ You can set the parameters passed to the Java VM when running Maven2 bootstrap,
 setting the environment variable MAVEN_OPTS, e.g.
 e.g. to run in offline mode, set MAVEN_OPTS=-o
 
-Then run m2-bootstrap-all.bat (in Windows) or m2-bootstrap-all.sh (in Unix)
+Then run bootstrap.bat (in Windows) or bootstrap.sh (in Unix)
 
 NOTE: You must run these instructions from this directory!
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 1a724fcecc..7c1a13f663 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,8 +21,7 @@ BOOTSTRAP_JAR=bootstrap-mini/target/bootstrap-mini.jar
 )
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
-#PLUGINS_DIR=../plugins
-PLUGINS_DIR=maven-plugins
+PLUGINS_DIR=../plugins
 if [ -d $PLUGINS_DIR ]; then
   ARGS="$ARGS --build-plugins --plugins-directory=$PLUGINS_DIR"
 fi
diff --git a/ci.sh b/ci.sh
index 2aedbca299..bdb662c271 100755
--- a/ci.sh
+++ b/ci.sh
@@ -39,7 +39,7 @@ DEPLOY_SITE=http://maven.zones.apache.org/~maven/builds
 DIST=m2-${TIMESTAMP}.tar.gz
 SVN=svn
 
-export M2_HOME=$HOME/maven-2.0.1-SNAPSHOT
+export M2_HOME=$DIR/maven-2.0.1-SNAPSHOT
 PATH=$PATH:$JAVA_HOME/bin:$M2_HOME/bin
 export PATH
 
@@ -86,6 +86,7 @@ fi
       cd $DIR
         
       $SVN co http://svn.apache.org/repos/asf/maven/components/trunk maven-components > $HOME_DIR/$SCM_LOG 2>&1
+      $SVN co http://svn.apache.org/repos/asf/maven/plugins/trunk plugins > $HOME_DIR/$SCM_LOG 2>&1
     
       echo "true" > $HOME_DIR/build_required     
     )
diff --git a/m2-bootstrap-all.sh b/m2-bootstrap-all.sh
deleted file mode 100755
index 72717e9cb4..0000000000
--- a/m2-bootstrap-all.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Check to make sure  JAVA_HOME is set
-[ -z "$JAVA_HOME" ] && echo && echo 'You must set $JAVA_HOME to use mboot!' && echo && exit 1
-
-JAVACMD=$JAVA_HOME/bin/java
-
-ARGS="$@"
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] && M2_HOME=`cygpath -w "$M2_HOME"`
-fi
-
-if [ -z "$M2_HOME" ]; then
-  echo "M2_HOME must be set."
-  exit 1
-fi
-
-HOME_ARGS="-Dmaven.home=$M2_HOME"
-
-# Build and install mboot
-(
-  echo "-----------------------------------------------------------------------"
-  echo " Building mboot ... "
-  echo "-----------------------------------------------------------------------"  
-
-  cd ./maven-mboot2
-  ./build
-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-
-(
-  echo "-----------------------------------------------------------------------"
-  echo " Building maven2 components ... "
-  echo "-----------------------------------------------------------------------"  
-
-  "$JAVACMD" "$HOME_ARGS" $MAVEN_OPTS -jar mboot.jar $ARGS
-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-
-echo "-----------------------------------------------------------------------"
-echo " Rebuilding maven2 plugins ... "
-echo "-----------------------------------------------------------------------"  
-
-# I Really Don't want to be rebuilding these (Especially the reports) every time, but
-# until we regularly push them to the repository and the integration tests rely on
-# some of these plugins, there is no choice
-(
-  # Build plugin plugin first, it seems to choke on the version built by the bootstrap
-  cd maven-plugins/maven-plugin-plugin
-
-  mvn --no-plugin-registry --batch-mode --fail-at-end -e $ARGS clean:clean install
-)
-
-(
-  cd maven-plugins
-  # update the release info to ensure these versions get used in the integration tests
-  mvn --no-plugin-registry --batch-mode --fail-at-end -e $ARGS clean:clean install
-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-
-(
-  cd ./maven-core-it
-  echo
-  echo "Running maven-core integration tests ..."
-  echo 
-  ./maven-core-it.sh $ARGS
-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi