diff --git a/README.bootstrap.txt b/README.bootstrap.txt
index 0ca9b0bb50..76a42a018a 100644
--- a/README.bootstrap.txt
+++ b/README.bootstrap.txt
@@ -8,7 +8,7 @@ You'll need:
 
 First, give Ant a location into which the completed Maven distro should be installed:
 
-    export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT
+    export M2_HOME=$HOME/apps/maven/apache-maven-3.0-SNAPSHOT
 
 Then, run Ant:
 
diff --git a/build-mercury.xml b/build-mercury.xml
index 34dd74ebc2..b76109cbb3 100644
--- a/build-mercury.xml
+++ b/build-mercury.xml
@@ -71,9 +71,9 @@ END SNIPPET: ant-bootstrap -->
     <property name="maven.repo.update.policy" value="always"/>
 -->
     <property name="maven.repo.update.policy" value="daily"/>
-    
+
     <property name="maven.repo.system" value="don.t"/>
-    
+
     <condition property="do.not.clean.local.repo">
       <not>
         <isset property="clean.local.repo"/>
@@ -110,13 +110,13 @@ END SNIPPET: ant-bootstrap -->
       <replacefilter token='@Component( role = RepositorySystem.class, hint = "default" )'
                      value='@Component( role = RepositorySystem.class, hint = "${mercury-hint}" )'/>
     </replace>
-    
+
     <echo>maven.repo.system is ${maven.repo.system}, flip: legacy-hint=${legacy-hint}, mercury-hint=${mercury-hint}</echo>
 
   </target>
 
   <target name="flip-default-repository-system" description="flips repository system impl">
-  	
+
     <condition property="legacy-hint" value="default">
       <equals arg1="${maven.repo.system}" arg2="legacy"/>
     </condition>
@@ -130,11 +130,11 @@ END SNIPPET: ant-bootstrap -->
     <condition property="mercury-hint" value="default">
       <equals arg1="${maven.repo.system}" arg2="mercury"/>
     </condition>
-    
+
     <condition property="do.not.flip.repository" value="default">
       <equals arg1="${maven.repo.system}" arg2="don.t"/>
     </condition>
-  	
+
   	<antcall target="flip-default-repository"/>
 
   </target>
@@ -143,8 +143,8 @@ END SNIPPET: ant-bootstrap -->
     <property name="verbose" value="false"/>
     <!-- Pull the dependencies that Maven needs to build -->
     <copy file="pom.xml" tofile="dependencies.xml"/>
-    <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
-    <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
+    <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-start-comment--&gt;" value="&lt;!--"/>
+    <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-end-comment--&gt;" value="--&gt;"/>
 
     <mercury:local-repository location="${maven.repo.local}"/>
     <mercury:remote-repository id="central" location="${maven.repo.central}" updatePolicy="${maven.repo.update.policy}"/>
diff --git a/build.xml b/build.xml
index affb18211a..df8a8918ac 100644
--- a/build.xml
+++ b/build.xml
@@ -78,8 +78,8 @@ END SNIPPET: ant-bootstrap -->
     <property name="verbose" value="false"/>
     <!-- Pull the dependencies that Maven needs to build -->
     <copy file="pom.xml" tofile="dependencies.xml"/>
-    <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
-    <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
+    <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-start-comment--&gt;" value="&lt;!--"/>
+    <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-end-comment--&gt;" value="--&gt;"/>
     <artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
     <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
        <localRepository path="${maven.repo.local}"/>
diff --git a/pom.xml b/pom.xml
index 5382b4c43d..4cf9abb70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,13 +182,13 @@ under the License.
     <jxpathVersion>1.3</jxpathVersion>
     <staxVersion>1.0.1</staxVersion>
   </properties>
-  
-  <!--start-->
+
+  <!--bootstrap-start-comment-->
   <dependencyManagement>
-  <!--end-->
+  <!--bootstrap-end-comment-->
     <dependencies>
       <!--  Maven Modules -->
-      <!--start-->
+      <!--bootstrap-start-comment-->
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-mercury</artifactId>
@@ -254,7 +254,7 @@ under the License.
         <artifactId>maven-compat</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <!--end-->
+      <!--bootstrap-end-comment-->
       <!--  Plexus -->
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -453,19 +453,19 @@ under the License.
         <artifactId>plexus-plugin-manager</artifactId>
         <version>${plexusPluginManagerVersion}</version>
       </dependency>
-      <!--start-->
+      <!--bootstrap-start-comment-->
       <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>${easyMockVersion}</version>
         <scope>test</scope>
       </dependency>
-      <!--end-->
+      <!--bootstrap-end-comment-->
     </dependencies>
-    <!--start-->
+    <!--bootstrap-start-comment-->
   </dependencyManagement>
-  <!--end-->
-  <!--start-->
+  <!--bootstrap-end-comment-->
+  <!--bootstrap-start-comment-->
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -474,7 +474,7 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <!--end-->
+  <!--bootstrap-end-comment-->
 
   <build>
     <pluginManagement>