diff --git a/build.versions b/build.versions
index 3620dae..7438f12 100644
--- a/build.versions
+++ b/build.versions
@@ -1,14 +1,14 @@
 # Compile
 
-org.eclipse.virgo.kernel=2.1.0.D-20100902122230
-org.eclipse.virgo.osgi=2.1.0.D-20100823153033
-org.eclipse.virgo.medic=2.1.0.D-20100902121239
-org.eclipse.virgo.repository=2.1.0.D-20100902121803
-org.eclipse.virgo.util=2.1.0.D-20100823153235
+org.eclipse.virgo.kernel=2.1.0.M04-incubation
+org.eclipse.virgo.osgi=2.1.0.M04-incubation
+org.eclipse.virgo.medic=2.1.0.M04-incubation
+org.eclipse.virgo.repository=2.1.0.M04-incubation
+org.eclipse.virgo.util=2.1.0.M04-incubation
 org.osgi.core=4.1.0
 
 # Test
-org.eclipse.virgo.test=2.1.0.D-20100823153727
+org.eclipse.virgo.test=2.1.0.M04-incubation
 org.aspectj=1.6.6.RELEASE
 org.eclipse.osgi=3.5.1.R35x_v20091005
 
diff --git a/org.eclipse.virgo.kernel.tools/.classpath b/org.eclipse.virgo.kernel.tools/.classpath
index cb8dcd6..ab03673 100644
--- a/org.eclipse.virgo.kernel.tools/.classpath
+++ b/org.eclipse.virgo.kernel.tools/.classpath
@@ -22,16 +22,16 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100902121803/org.eclipse.virgo.repository-2.1.0.D-20100902121803.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100902121803/org.eclipse.virgo.repository-sources-2.1.0.D-20100902121803.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.D-20100823153235/org.eclipse.virgo.util.osgi-2.1.0.D-20100823153235.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.D-20100823153235/org.eclipse.virgo.util.parser.manifest-2.1.0.D-20100823153235.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.D-20100902122230/org.eclipse.virgo.kernel.artifact-2.1.0.D-20100902122230.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.D-20100902122230/org.eclipse.virgo.kernel.artifact-sources-2.1.0.D-20100902122230.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100902121239/org.eclipse.virgo.medic-2.1.0.D-20100902121239.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100902121239/org.eclipse.virgo.medic-sources-2.1.0.D-20100902121239.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100823153727/org.eclipse.virgo.test.framework-2.1.0.D-20100823153727.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100823153727/org.eclipse.virgo.test.framework-sources-2.1.0.D-20100823153727.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100823153033/org.eclipse.virgo.osgi.launcher-2.1.0.D-20100823153033.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100823153033/org.eclipse.virgo.osgi.launcher-sources-2.1.0.D-20100823153033.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.M04-incubation/org.eclipse.virgo.repository-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.M04-incubation/org.eclipse.virgo.repository-sources-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M04-incubation/org.eclipse.virgo.util.osgi-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M04-incubation/org.eclipse.virgo.util.parser.manifest-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M04-incubation/org.eclipse.virgo.kernel.artifact-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M04-incubation/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M04-incubation/org.eclipse.virgo.medic-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M04-incubation/org.eclipse.virgo.medic-sources-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M04-incubation/org.eclipse.virgo.test.framework-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M04-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M04-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M04-incubation/org.eclipse.virgo.osgi.launcher-sources-2.1.0.M04-incubation.jar"/>
 	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100823153235/org.eclipse.virgo.util.common-2.1.0.D-20100823153235.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100823153235/org.eclipse.virgo.util.common-sources-2.1.0.D-20100823153235.jar"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/ivydata-2.1.0.D-20100823153235.properties"/>
-	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.D-20100823153235/org.eclipse.virgo.util.math-2.1.0.D-20100823153235.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M04-incubation/org.eclipse.virgo.util.common-2.1.0.M04-incubation.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M04-incubation/org.eclipse.virgo.util.common-sources-2.1.0.M04-incubation.jar"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/ivydata-2.1.0.M04-incubation.properties"/>
+	<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.M04-incubation/org.eclipse.virgo.util.math-2.1.0.M04-incubation.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>