diff --git a/ci.sh b/ci.sh
index 4d90b0eca9..e154efd1a3 100755
--- a/ci.sh
+++ b/ci.sh
@@ -115,7 +115,7 @@ export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic
     echo
 
     (
-      cd $DIR/maven-components/maven-core
+      cd $DIR/maven-components
   
       ./m2-bootstrap-all.sh
     )    
diff --git a/m2-bootstrap-all.bat b/m2-bootstrap-all.bat
new file mode 100644
index 0000000000..107a72118f
--- /dev/null
+++ b/m2-bootstrap-all.bat
@@ -0,0 +1,9 @@
+@echo off
+
+cd maven-mboot2
+
+call .\build
+
+cd ..
+
+%JAVA_HOME%\bin\java -jar mboot.jar
diff --git a/m2-bootstrap-all.sh b/m2-bootstrap-all.sh
new file mode 100644
index 0000000000..2acd64ee24
--- /dev/null
+++ b/m2-bootstrap-all.sh
@@ -0,0 +1,36 @@
+#!/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
+
+# 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 "-----------------------------------------------------------------------"  
+
+  $JAVA_HOME/bin/java -jar mboot.jar
+  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 
+  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+)
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
diff --git a/mboot.jar b/mboot.jar
deleted file mode 100644
index bb7b8083c0..0000000000
Binary files a/mboot.jar and /dev/null differ