diff --git a/build/target-platform/build.xml b/build/target-platform/build.xml
index a03e777..7b89da0 100644
--- a/build/target-platform/build.xml
+++ b/build/target-platform/build.xml
@@ -67,11 +67,11 @@ To run for JBDS target file WHILE JBT target file is being run:
 
 To build an alternate target platform (eg., Juno) for JBT:
 
-	$ ant -DtargetFile=multiple-junoM6.target -DrepoDir=${WORKINGDIR}/JBT_REPO/ -Declipse.version=4.2M6 -Declipse.type=SDK -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/S-4.2M6-201203151300/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/latest/
+	$ ant -DtargetFile=multiple.target -DrepoDir=${WORKINGDIR}/JBT_REPO/ -Declipse.version=4.2 -Declipse.type=SDK -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/R-4.2-201206081400/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/
 
 To build an alternate target platform (eg., Juno) for JBDS:
 
-	$ ant -DtargetFile=jbds-junoM6.target -DrepoDir=${WORKINGDIR}/JBDS_REPO/ -Declipse.version=4.2M6 -Declipse.type=SDK -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/S-4.2M6-201203151300/
+	$ ant -DtargetFile=jbds.target -DrepoDir=${WORKINGDIR}/JBDS_REPO/ -Declipse.version=4.2 -Declipse.type=SDK -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/R-4.2-201206081400/
 
 </echo>
 	</target>
@@ -153,16 +153,16 @@ To build an alternate target platform (eg., Juno) for JBDS:
 		     also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
 		-->
 		<!-- http://download.eclipse.org/eclipse/downloads/drops/M20120201-1336/download.php?dropFile=eclipse-platform-M20120201-1336-linux-gtk-x86_64.tar.gz -->
-		<property name="eclipse.version" value="3.7.2" />
+		<!-- http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-platform-4.2-linux-gtk-x86_64.tar.gz -->
+		<!-- eclipse-platform-3.8M6-linux-gtk-x86_64.tar.gz -->
+		<!-- eclipse-platform-3.7.2-linux-gtk-x86_64.tar.gz -->
+		<property name="eclipse.version" value="4.2" />
 		<property name="eclipse.type" value="platform" />
-		<property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/eclipse/downloads/drops/R-3.7.2-201202080800/"/>
+		<property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/eclipse/downloads/drops/R-4.2-201206081400/"/>
 
 		<if>
 			<equals arg1="${arch}" arg2="x86" />
 			<then>
-				<!-- eclipse-SDK-4.2M6-linux-gtk-x86_64.tar.gz -->
-				<!-- eclipse-platform-3.8M6-linux-gtk-x86_64.tar.gz -->
-				<!-- eclipse-platform-3.7.2-linux-gtk-x86_64.tar.gz -->
 				<property name="eclipse.file" value="eclipse-${eclipse.type}-${eclipse.version}-${os}.${ext}" />
 			</then>
 			<else>
diff --git a/build/target-platform/jbds.target b/build/target-platform/jbds.target
index 1b601ff..a503780 100644
--- a/build/target-platform/jbds.target
+++ b/build/target-platform/jbds.target
@@ -11,9 +11,9 @@
 
 			<!-- don't forget to increment these files when moving up a version:
 			 build.xml, *.target*, publish.sh, target2p2mirror.xml -->
-			<repository location="http://download.jboss.org/jbosstools/updates/juno/M6/"/>
-			<!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/juno/M6/"/> -->
-			<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/juno/M6/"/> -->
+			<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+			<!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/juno/SR0/"/> -->
+			<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/juno/SR0/"/> -->
 
 			<!-- m2e, m2e-wtp + deps -->
 			<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
@@ -29,7 +29,7 @@
 			<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-			<unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/>
+			<!-- removed after M6; not in SR0 <unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/> -->
 
 			<!-- Orbit bundles -->
 			<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
diff --git a/build/target-platform/jbds.target.p2mirror.xml b/build/target-platform/jbds.target.p2mirror.xml
index 17b7075..0232f29 100644
--- a/build/target-platform/jbds.target.p2mirror.xml
+++ b/build/target-platform/jbds.target.p2mirror.xml
@@ -28,7 +28,7 @@
 <p2.mirror destination="file://${repoDir}" verbose="${verbose}">
 <slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
 <source>
-<repository location="http://download.jboss.org/jbosstools/updates/juno/M6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
 </source>
 <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
 <iu id="org.eclipse.m2e.feature.feature.group" version=""/>
@@ -43,7 +43,6 @@
 <iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
 <iu id="org.eclipse.equinox.p2.discovery" version=""/>
 <iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
-<iu id="org.eclipse.net4j.jms.api" version=""/>
 <iu id="javax.wsdl" version=""/>
 <iu id="org.jdom" version=""/>
 <iu id="org.apache.oro" version=""/>
diff --git a/build/target-platform/multiple.target b/build/target-platform/multiple.target
index 89430b1..47d2970 100644
--- a/build/target-platform/multiple.target
+++ b/build/target-platform/multiple.target
@@ -15,7 +15,7 @@
 		<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
 			<!-- don't forget to increment these files when moving up a version:
 				build.xml, *.target*, publish.sh, target2p2mirror.xml -->
-			<repository location="http://download.jboss.org/jbosstools/updates/juno/M6/"/>
+			<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
 
 			<!-- m2e, m2e-wtp + deps -->
 			<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-			<unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/>
+			<!-- removed after M6; not in SR0 <unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/> -->
 
 			<!-- Orbit bundles -->
 			<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
diff --git a/build/target-platform/multiple.target.p2mirror.xml b/build/target-platform/multiple.target.p2mirror.xml
index 70589f5..c5b6760 100644
--- a/build/target-platform/multiple.target.p2mirror.xml
+++ b/build/target-platform/multiple.target.p2mirror.xml
@@ -28,7 +28,7 @@
 <p2.mirror destination="file://${repoDir}" verbose="${verbose}">
 <slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
 <source>
-<repository location="http://download.jboss.org/jbosstools/updates/juno/M6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
 </source>
 <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
 <iu id="org.eclipse.m2e.feature.feature.group" version=""/>
@@ -43,7 +43,6 @@
 <iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
 <iu id="org.eclipse.equinox.p2.discovery" version=""/>
 <iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
-<iu id="org.eclipse.net4j.jms.api" version=""/>
 <iu id="javax.wsdl" version=""/>
 <iu id="org.jdom" version=""/>
 <iu id="org.apache.oro" version=""/>
diff --git a/build/target-platform/pom.xml b/build/target-platform/pom.xml
index 1bfccfb..581a019 100644
--- a/build/target-platform/pom.xml
+++ b/build/target-platform/pom.xml
@@ -14,10 +14,10 @@
 		<target.platform.classifier.multiple.name>multiple</target.platform.classifier.multiple.name>
 		<target.platform.classifier.unified.name>unified</target.platform.classifier.unified.name>
 		<target.platform.classifier.local.name>local</target.platform.classifier.local.name>
-		<unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/latest/</unified.URL>
-		<eclipse.version>4.2M6</eclipse.version>
+		<unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/</unified.URL>
+		<eclipse.version>4.2</eclipse.version>
 		<eclipse.type>platform</eclipse.type>
-		<eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;file=/eclipse/downloads/drops4/S-4.2M6-201203151300/</eclipse.URL>
+		<eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;file=/eclipse/downloads/drops4/R-4.2-201206081400/</eclipse.URL>
 	</properties>
 
 	<build>
diff --git a/build/target-platform/publish.sh b/build/target-platform/publish.sh
index bd90d86..e334c01 100644
--- a/build/target-platform/publish.sh
+++ b/build/target-platform/publish.sh
@@ -5,10 +5,10 @@
 # don't forget to increment these files when moving up a version:
 # build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
 # also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
-targetZipFile=e42M6-wtp34M6.target
-repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.4.juno.M6
-destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.M6
-DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.M6
+targetZipFile=e420-wtp340.target
+repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.4.juno.SR0
+destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.SR0
+DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.SR0
 include="*"
 exclude="--exclude '.blobstore'" # exclude the .blobstore
 
@@ -23,22 +23,22 @@ while [ "$#" -gt 0 ]; do
 		'-include') include="$2"; shift 2;;
 		'-exclude') exclude="$2"; shift 2;;
 
-		'-jbt_3.4.juno.M6') 
+		'-jbt_3.4.juno.SR0') 
 		# defaults for JBT (trunk)
-		targetZipFile=e42M6-wtp34M6.target
-		repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.4.juno.M6
-		destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.M6
-		DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.M6
+		targetZipFile=e420-wtp340.target
+		repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.4.juno.SR0
+		destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.SR0
+		DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.SR0
 		include="*"
 		exclude="--exclude '.blobstore'" # exclude the .blobstore
 		shift 1;;
 
-		'-jbds_3.4.juno.M6') 
+		'-jbds_3.4.juno.SR0') 
 		# defaults for JBDS (trunk)
-		targetZipFile=jbds500-e42M6-wtp34M6.target
-		repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.4.juno.M6
-		destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.4.juno.M6
-		DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.4.juno.M6
+		targetZipFile=jbds500-e420-wtp340.target
+		repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.4.juno.SR0
+		destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.4.juno.SR0
+		DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.4.juno.SR0
 		include=".blobstore *" # include the .blobstore
 		exclude="" 
 		shift 1;;		
diff --git a/build/target-platform/target2p2mirror.xml b/build/target-platform/target2p2mirror.xml
index 2616262..592fc68 100644
--- a/build/target-platform/target2p2mirror.xml
+++ b/build/target-platform/target2p2mirror.xml
@@ -3,7 +3,7 @@
 	     build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
 	     also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL -->
 
-	<property name="targetFile" value="e42M6-wtp34M6.target" />
+	<property name="targetFile" value="e420-wtp340.target" />
 
 	<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available; 
 		 if useLatest = false, include versions and fetch specific versions requested. -->
diff --git a/build/target-platform/targetUpdateFromRepo.xml b/build/target-platform/targetUpdateFromRepo.xml
index 8f0d0c4..fc67150 100644
--- a/build/target-platform/targetUpdateFromRepo.xml
+++ b/build/target-platform/targetUpdateFromRepo.xml
@@ -12,7 +12,7 @@
 	<!-- create a second .target file which replaces all URLs with a single unified (published) one
 		(eg., for jbosstools target platform site), set these properties too -->
 	<property name="unified.targetFile" value="unified.target" />
-	<property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.SR2/latest/" />
+	<property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/" />
 	<property name="local.targetFile" value="local.target" />
 	<property name="local.URL" value="file://${repoDir}" />
 
diff --git a/build/target-platform/unified.target b/build/target-platform/unified.target
index 6ce54d2..0250660 100644
--- a/build/target-platform/unified.target
+++ b/build/target-platform/unified.target
@@ -9,13 +9,13 @@
 	<locations>
 		<!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
 		<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-			<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/latest/"/>
+			<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/"/>
 		</location> -->
 
 		<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
 			<!-- don't forget to increment these files when moving up a version:
 				build.xml, *.target*, publish.sh, target2p2mirror.xml -->
-			<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/latest/"/>
+			<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/"/>
 
 			<!-- m2e, m2e-wtp + deps -->
 			<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110808-1657"/>
 			<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-			<unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/>
+			<!-- removed after M6; not in SR0 <unit id="org.eclipse.net4j.jms.api" version="3.1.0.v20120308-0526"/> -->
 
 			<!-- Orbit bundles -->
 			<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
diff --git a/build/target-platform/unified.target.p2mirror.xml b/build/target-platform/unified.target.p2mirror.xml
index eb06d3c..0dd43a0 100644
--- a/build/target-platform/unified.target.p2mirror.xml
+++ b/build/target-platform/unified.target.p2mirror.xml
@@ -28,7 +28,7 @@
 <p2.mirror destination="file://${repoDir}" verbose="${verbose}">
 <slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
 <source>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/latest/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0/latest/"/>
 </source>
 <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
 <iu id="org.eclipse.m2e.feature.feature.group" version=""/>