This commit was manufactured by cvs2svn to create tag 'HELIOS_SR1_RC4'.
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/build.xml b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
index de9de0a..bb1e9cf 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="project" default="build.site">
-	<property name="director.url" value="http://www.eclipse.org/downloads/download.php?file=/tools/buckminster/products/director_1.0.0.r10307.zip&amp;r=1" />
+	<property name="director.url" value="http://www.eclipse.org/downloads/download.php?file=/tools/buckminster/products/org.eclipse.equinox.p2.director.product_1.0.0.v20100203-1557.zip&amp;r=1" />
 
 	<!--Property file containing overrides for the default properties
 	-->
@@ -8,7 +8,7 @@
 	<property file="${build.root}/build.properties" />
 	<property name="bm.headless.site" value="http://download.eclipse.org/tools/buckminster/headless-3.5/" />
 	<property name="helios.site" value="http://download.eclipse.org/releases/helios/" />
-	<property name="staging.site" value="http://download.eclipse.org/releases/staging/" />
+	<property name="staging.site" value="http://download.eclipse.org/releases/maintenance/" />
 	<property name="platform.site" value="http://download.eclipse.org/eclipse/updates/3.6milestones/" />
 	<property name="buildtools" location="${build.root}/tools" />
 	<property name="workspace" location="${build.root}/workspace" />
@@ -114,7 +114,7 @@
       </args>
     </eclipse.launch>
   	<copy todir="${targetPlatformPath}/plugins">
-  	  <fileset dir="/home/data/httpd/download.eclipse.org/releases/staging/aggregate/plugins">
+  	  <fileset dir="/home/data/httpd/download.eclipse.org/releases/maintenance/aggregate/plugins">
   	    <include name="**/org.eclipse*intro*"/>
   	    <include name="**/org.eclipse*capabilities*"/>
   	  </fileset>
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery b/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
index 0231196..c004ebe 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
+++ b/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
@@ -6,4 +6,5 @@
     <cq:property key="target.ws" value="*"/>
     <cq:advisorNode namePattern="^org\.mortbay\.management$" allowCircularDependency="true"/>
     <cq:advisorNode namePattern="^org\.eclipse\.ui$" componentType="osgi.bundle" allowCircularDependency="true"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.epp.*" branchTagPath="HELIOS"/>
 </cq:componentQuery>
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/feature.xml b/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
index 5aa5901..c76fda9 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
+++ b/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
@@ -65,4 +65,8 @@
          id="org.eclipse.epp.package.soa.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.epp.package.transition.feature"
+         version="0.0.0"/>
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.common.feature/build.properties b/packages/org.eclipse.epp.package.common.feature/build.properties
index 7b9f14c..18f39b8 100644
--- a/packages/org.eclipse.epp.package.common.feature/build.properties
+++ b/packages/org.eclipse.epp.package.common.feature/build.properties
@@ -3,3 +3,5 @@
                epl-v10.html,\
                license.html,\
                feature.properties
+
+               
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml
index 5207152..59e8b2b 100644
--- a/packages/org.eclipse.epp.package.common.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.common.feature"
       label="EPP Common Package Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP">
 
    <description>
@@ -15,12 +15,13 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <requires>
       <import feature="org.eclipse.epp.usagedata.feature"/>
+      <import feature="org.eclipse.epp.mpc"/>
    </requires>
 
    <plugin
@@ -30,4 +31,5 @@
          version="0.0.0"
          unpack="false"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.common.feature/p2.inf b/packages/org.eclipse.epp.package.common.feature/p2.inf
index d9b3613..14159d4 100644
--- a/packages/org.eclipse.epp.package.common.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.common.feature/p2.inf
@@ -3,9 +3,9 @@
 properties.1.value=false
 
 #instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/indigo,name:EPP Packages Repository);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/indigo,name:EPP Packages Repository);
+#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 #instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/indigo);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/indigo);
+#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
diff --git a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
index 6432bbc..121c682 100644
--- a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Common Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.common;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.epp.mpc.ui;bundle-version="1.0.0"
diff --git a/packages/org.eclipse.epp.package.common/icons/yoxos32.png b/packages/org.eclipse.epp.package.common/icons/yoxos32.png
index 9a8b200..011321b 100644
--- a/packages/org.eclipse.epp.package.common/icons/yoxos32.png
+++ b/packages/org.eclipse.epp.package.common/icons/yoxos32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.common/plugin.xml b/packages/org.eclipse.epp.package.common/plugin.xml
index ede9bd3..7d61476 100644
--- a/packages/org.eclipse.epp.package.common/plugin.xml
+++ b/packages/org.eclipse.epp.package.common/plugin.xml
@@ -12,4 +12,5 @@
      </catalog>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
index 338d04c..08c56f4 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
@@ -36,9 +36,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="3.7.0" />
+	<rcp version="3.6.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-cpp-indigo-SR1-RC2" />
+	<product name="eclipse-cpp-helios-SR1-RC4" />
 
 </configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.product b/packages/org.eclipse.epp.package.cpp.feature/epp.product
index d022cf2..4554ebb 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.cpp.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.cpp.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index ec850ad..f829d15 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.cpp.feature"
       label="EPP CPP Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.cpp">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,8 +28,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt" version="7.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn_feature"/>
@@ -50,4 +50,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
index 0d97387..8f190a6 100644
--- a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP CPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.cpp/plugin.xml b/packages/org.eclipse.epp.package.cpp/plugin.xml
index c38c55a..9b6504f 100644
--- a/packages/org.eclipse.epp.package.cpp/plugin.xml
+++ b/packages/org.eclipse.epp.package.cpp/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse IDE for C/C++ Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse IDE for C/C++ Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
index 87202f9..a450702 100644
--- a/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
+++ b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
@@ -33,9 +33,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-indigo-SR1-RC2" />
+	<product name="eclipse-java-helios-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.product b/packages/org.eclipse.epp.package.java.feature/epp.product
index 9cbada1..aa8ae92 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.product
+++ b/packages/org.eclipse.epp.package.java.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -49,7 +49,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.java.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.java.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index 51bec51..fbba6f3 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.java.feature"
       label="EPP Java Package"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.java">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
       <discovery label="Mylyn Updates" url="http://download.eclipse.org/tools/mylyn/update/e3.4/"/>
    </url>
 
@@ -29,9 +29,9 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
@@ -48,4 +48,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.feature/p2.inf
index 75c7e37..c5f06ba 100644
--- a/packages/org.eclipse.epp.package.java.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.java.feature/p2.inf
@@ -8,9 +8,9 @@
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
index e2f41af..67107f7 100644
--- a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Java Package
 Bundle-SymbolicName: org.eclipse.epp.package.java;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.java/plugin.xml b/packages/org.eclipse.epp.package.java/plugin.xml
index f6236cd..914cf25 100644
--- a/packages/org.eclipse.epp.package.java/plugin.xml
+++ b/packages/org.eclipse.epp.package.java/plugin.xml
@@ -26,7 +26,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse IDE for Java Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse IDE for Java Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="windowImages"
@@ -52,5 +52,6 @@
             productId="org.eclipse.epp.package.java.product">
       </introProductBinding>
    </extension>
+   
 </plugin>
 
diff --git a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
index d263f5d..0707515 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
@@ -32,9 +32,9 @@
 

   <!-- version, the RCP version to build. This is used to determine the file 

     name of the root file archives -->

-  <rcp version="3.7.0" />

+  <rcp version="3.6.1" />

 

   <!-- name, the name of the product, used in naming the created files. -->

-  <product name="eclipse-javascript-indigo-SR1-RC2" />

+  <product name="eclipse-javascript-helios-SR1-RC4" />

 

 </configuration>

diff --git a/packages/org.eclipse.epp.package.javascript.feature/epp.product b/packages/org.eclipse.epp.package.javascript.feature/epp.product
index 606fe75..09e3018 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/epp.product
+++ b/packages/org.eclipse.epp.package.javascript.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Javascript Developers" uid="epp.package.javascript" id="org.eclipse.epp.package.javascript.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Javascript Developers" uid="epp.package.javascript" id="org.eclipse.epp.package.javascript.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -38,7 +38,7 @@
       </win>
    </launcher>
 
-   <intro introId="org.eclipse.wtp.epp.package.javascript.intro.intro"/>
+   <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
       <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</linux>
@@ -151,12 +151,12 @@
    </license>
 
    <plugins>
-      <plugin id="org.eclipse.epp.package.jee"/>
+      <plugin id="org.eclipse.epp.package.javascript"/>
       <plugin id="org.eclipse.wtp.epp.package.jee.intro" fragment=""/>
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.javascript.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.javascript.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.properties b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
index c6c60e8..467eef8 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
@@ -21,7 +21,7 @@
 providerName=Eclipse.org - EPP

 

 # "updateSiteName" property - label for the update site

-discoverySiteName=Eclipse Indigo Release

+discoverySiteName=Eclipse Helios Release

 

 # "description" property - description of the feature

 description=Eclipse Javascript IDE is an all-in-one package for creating web applications. \n\ 

diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.xml b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
index 2460302..5e3ef66 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.epp.package.javascript.feature"

       label="%featureName"

-      version="1.4.0.qualifier"

+      version="1.3.1.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.epp.package.javascript">

 

@@ -19,7 +19,7 @@
    </license>

 

    <url>

-      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/indigo/"/>

+      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/helios/"/>

    </url>

 

    <includes

@@ -46,4 +46,5 @@
          install-size="0"

          version="0.0.0"/>

 

+

 </feature>

diff --git a/packages/org.eclipse.epp.package.javascript.feature/p2.inf b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
index ff42775..ee6d170 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
@@ -8,13 +8,13 @@
 requires.1.greedy=true

 

 instructions.configure=\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/indigo,name:The Eclipse Web Tools Platform (WTP) software repository);\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/indigo,name:The Eclipse Web Tools Platform (WTP) software repository);\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/helios,name:The Eclipse Web Tools Platform (WTP) software repository);\

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/helios,name:The Eclipse Web Tools Platform (WTP) software repository);\

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);\

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);

 

 instructions.unconfigure=\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/indigo);\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/indigo);\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/helios);\

+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/helios);\

+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);\

+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.javascript/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.javascript/META-INF/MANIFEST.MF
index f80a19b..54c6cea 100644
--- a/packages/org.eclipse.epp.package.javascript/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.javascript/META-INF/MANIFEST.MF
@@ -3,4 +3,4 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.epp.package.javascript;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
diff --git a/packages/org.eclipse.epp.package.javascript/build.properties b/packages/org.eclipse.epp.package.javascript/build.properties
index 9851936..4bacef2 100644
--- a/packages/org.eclipse.epp.package.javascript/build.properties
+++ b/packages/org.eclipse.epp.package.javascript/build.properties
@@ -11,3 +11,5 @@
                javascript-ide_x48.png,\

                OSGI-INF/l10n/,\

                helpData.xml,\

+               intro-eclipse.png

+
diff --git a/packages/org.eclipse.epp.package.javascript/intro-eclipse.png b/packages/org.eclipse.epp.package.javascript/intro-eclipse.png
new file mode 100644
index 0000000..015e7fc
--- /dev/null
+++ b/packages/org.eclipse.epp.package.javascript/intro-eclipse.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/plugin.xml b/packages/org.eclipse.epp.package.javascript/plugin.xml
index ba49448..9cb7c59 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin.xml
+++ b/packages/org.eclipse.epp.package.javascript/plugin.xml
@@ -18,7 +18,7 @@
          </property>

          <property

                name="aboutText"

-               value="Eclipse IDE for JavaScript Web Developers.&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2005, 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/webtools">

+               value="Eclipse IDE for JavaScript Web Developers.&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2005, 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/webtools">

          </property>

          <property

                name="startupProgressRect"

@@ -43,8 +43,27 @@
          <property

                name="buildIdLocation"

                value="303,190">

+         </property>

+         <property

+              name="introBrandingImage"

+              value="product:intro-eclipse.png"/>

+         <property

+               name="introTitle"

+               value="Welcome to Eclipse IDE for JavaScript Developers">

+         </property>

+         <property

+               name="introBrandingImageText"

+               value="Eclipse Project">

          </property>         

       </product>

    </extension>

+   <extension

+         point="org.eclipse.ui.intro">

+      <introProductBinding

+            introId="org.eclipse.ui.intro.universal"

+            productId="org.eclipse.epp.package.javascript.product">

+      </introProductBinding>

+   </extension>

+

 

 </plugin>

diff --git a/packages/org.eclipse.epp.package.javascript/plugin_customization.ini b/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
index 78d364a..eeb59da 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
@@ -26,8 +26,7 @@
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true

 

 # Welcome theme to use

-# TODO do we want a JavaScript specific welcome screen

-#org.eclipse.ui.intro/INTRO_THEME = org.eclipse.wtp.epp.package.jee.intro

+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.circles

 

 # Root page links to show in the Universal Welcome

 org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview,tutorials,samples,whatsnew

diff --git a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
index 6e570af..a5c3382 100644
--- a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
@@ -40,9 +40,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-indigo-SR1-RC2" />
+  <product name="eclipse-jee-helios-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.product b/packages/org.eclipse.epp.package.jee.feature/epp.product
index 9073e67..a941565 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.product
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -156,7 +156,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.jee.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.jee.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.properties b/packages/org.eclipse.epp.package.jee.feature/feature.properties
index 0d47ecc..f1815ba 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.properties
@@ -21,7 +21,7 @@
 providerName=Eclipse.org - EPP
 
 # "updateSiteName" property - label for the update site
-discoverySiteName=Eclipse Indigo Release
+discoverySiteName=Eclipse Helios Release
 
 # "description" property - description of the feature
 description=Eclipse Java EE IDE is an all-in-one package for creating web applications. \n\ 
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index af4361c..8e7d408 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.jee.feature"
       label="%featureName"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.epp.package.jee">
 
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/indigo/"/>
+      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/helios/"/>
    </url>
 
    <includes
@@ -148,4 +148,5 @@
          version="0.0.0"/>   
 -->
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index c4290d4..9c6767b 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -8,13 +8,13 @@
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/indigo,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/indigo,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo,name:Mylyn for Eclipse Indigo);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/helios,name:The Eclipse Web Tools Platform (WTP) software repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/helios,name:The Eclipse Web Tools Platform (WTP) software repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios,name:Mylyn for Eclipse Helios);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/indigo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
index 8740a5d..a2fb9f7 100644
--- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.epp.package.jee;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
diff --git a/packages/org.eclipse.epp.package.jee/plugin.xml b/packages/org.eclipse.epp.package.jee/plugin.xml
index 244fffe..3f40af4 100644
--- a/packages/org.eclipse.epp.package.jee/plugin.xml
+++ b/packages/org.eclipse.epp.package.jee/plugin.xml
@@ -30,7 +30,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse Java EE IDE for Web Developers.&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2005, 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/webtools">
+               value="Eclipse Java EE IDE for Web Developers.&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2005, 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/webtools">
          </property>
          <property
                name="startupProgressRect"
@@ -59,4 +59,5 @@
       </product>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml b/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
index 2ddfeec..5b5f6c0 100644
--- a/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
+++ b/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
@@ -39,9 +39,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="3.7.0" />
+	<rcp version="3.6.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-linuxtools-indigo-SR1-RC2-incubation" />
+	<product name="eclipse-linuxtools-helios-SR1-RC4-incubation" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.linuxtools.feature/epp.product b/packages/org.eclipse.epp.package.linuxtools.feature/epp.product
index e9c6047..00b4b90 100644
--- a/packages/org.eclipse.epp.package.linuxtools.feature/epp.product
+++ b/packages/org.eclipse.epp.package.linuxtools.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for C/C++ Linux Developers" uid="epp.package.linuxtools" id="org.eclipse.epp.package.linuxtools.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for C/C++ Linux Developers" uid="epp.package.linuxtools" id="org.eclipse.epp.package.linuxtools.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.linuxtools.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.linuxtools.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml b/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
index 4134858..c471b8a 100644
--- a/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.linuxtools.feature"
       label="EPP Linux Tools Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.linuxtools"
       os="linux"
@@ -18,8 +18,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -31,8 +31,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt" version="7.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn_feature"/>
@@ -65,4 +65,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.linuxtools/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.linuxtools/META-INF/MANIFEST.MF
index f21524c..5c1401f 100644
--- a/packages/org.eclipse.epp.package.linuxtools/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.linuxtools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Linuxtools Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.linuxtools;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.linuxtools/plugin.xml b/packages/org.eclipse.epp.package.linuxtools/plugin.xml
index 5ac64b5..1921880 100644
--- a/packages/org.eclipse.epp.package.linuxtools/plugin.xml
+++ b/packages/org.eclipse.epp.package.linuxtools/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse IDE for C/C++ Linux Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse IDE for C/C++ Linux Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
index 48aca16..ada64c7 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
@@ -86,9 +86,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-indigo-SR1-RC2-incubation" />
+  <product name="eclipse-modeling-helios-SR1-RC4-incubation" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.product b/packages/org.eclipse.epp.package.modeling.feature/epp.product
index ebac8c1..882371b 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.modeling.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.modeling.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index bdbe214..4ff00d6 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.modeling.feature"
       label="EPP Modeling Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.modeling">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,10 +28,10 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sdk" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sdk" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
       <import feature="org.eclipse.mylyn.pde_feature"/>
@@ -61,4 +61,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
index 88d5749..091d954 100644
--- a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Modeling Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.modeling;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.modeling/plugin.xml b/packages/org.eclipse.epp.package.modeling/plugin.xml
index 351320f..48c2982 100644
--- a/packages/org.eclipse.epp.package.modeling/plugin.xml
+++ b/packages/org.eclipse.epp.package.modeling/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse Modeling Tools&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse Modeling Tools&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
index 0559e40..bf6fff8 100644
--- a/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
+++ b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
@@ -49,12 +49,12 @@
 		version, the RCP version to build. This is used to determine the file
 		name of the root file archives
 	-->
-	<rcp version="3.7.0" />
+	<rcp version="3.6.1" />
 
 	<!--
 		name, name of the product, used in naming the created files.
 	-->
-	<product name="eclipse-php-indigo-SR1-RC2" />
+	<product name="eclipse-php-helios-SR1-RC4" />
 
 </configuration>
 
diff --git a/packages/org.eclipse.epp.package.php.feature/epp.product b/packages/org.eclipse.epp.package.php.feature/epp.product
index 831494f..d9cde73 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.product
+++ b/packages/org.eclipse.epp.package.php.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for PHP Developers" uid="epp.package.php" id="org.eclipse.epp.package.php.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for PHP Developers" uid="epp.package.php" id="org.eclipse.epp.package.php.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.php.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.php.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index c271f7c..896e7f6 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.php.feature"
       label="EPP PHP Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.php">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,8 +28,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.bugzilla_feature"/>
       <import feature="org.eclipse.mylyn.context_feature"/>
@@ -51,4 +51,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
index d0755f2..e34508b 100644
--- a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP PHP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.php;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.php/plugin.xml b/packages/org.eclipse.epp.package.php/plugin.xml
index 8a6080d..4994833 100644
--- a/packages/org.eclipse.epp.package.php/plugin.xml
+++ b/packages/org.eclipse.epp.package.php/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse for PHP Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse for PHP Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
index 1b34c4a..11bfe3a 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
@@ -40,9 +40,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-pulsar-indigo-SR1-RC2" />
+	<product name="eclipse-pulsar-helios-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/epp.product b/packages/org.eclipse.epp.package.pulsar.feature/epp.product
index 1bb8e9b..8c3af05 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/epp.product
+++ b/packages/org.eclipse.epp.package.pulsar.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Pulsar for Mobile Developers" uid="epp.package.pulsar" id="org.eclipse.epp.package.pulsar.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Pulsar for Mobile Developers" uid="epp.package.pulsar" id="org.eclipse.epp.package.pulsar.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -50,7 +50,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.pulsar.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.pulsar.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
index 166108e..ae5358e 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.pulsar.feature"
       label="EPP Pulsar Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.pulsar">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -25,13 +25,13 @@
          search-location="both"/>
 
    <requires>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mtj"/>
       <import feature="org.eclipse.sequoyah.device.common.feature"/>
       <import feature="org.eclipse.sequoyah.device.examples.feature"/>
@@ -61,4 +61,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.pulsar/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.pulsar/META-INF/MANIFEST.MF
index 1d284d5..b79597b 100644
--- a/packages/org.eclipse.epp.package.pulsar/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.pulsar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Pulsar Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.pulsar;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.pulsar/plugin.xml b/packages/org.eclipse.epp.package.pulsar/plugin.xml
index 456f5ad..1084bad 100644
--- a/packages/org.eclipse.epp.package.pulsar/plugin.xml
+++ b/packages/org.eclipse.epp.package.pulsar/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Pulsar for Mobile Developers.&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Pulsar Committers and others. 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/pulsar/">
+               value="Pulsar for Mobile Developers.&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Pulsar Committers and others. 2010.  All rights reserved.&#x0A;Visit http://www.eclipse.org/pulsar/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
index b669f93..aec8708 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
@@ -35,9 +35,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-indigo-SR1-RC2" />
+  <product name="eclipse-rcp-helios-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.product b/packages/org.eclipse.epp.package.rcp.feature/epp.product
index 097868a..2d10bde 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -50,7 +50,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.rcp.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.rcp.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 4b28f89..e6782ab 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.rcp.feature"
       label="EPP RCP/RAP Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.rcp">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,10 +28,10 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
@@ -43,8 +43,6 @@
       <import feature="org.eclipse.platform.source"/>
       <import feature="org.eclipse.rap.tooling"/>
       <import feature="org.eclipse.epp.package.common.feature"/>
-      <!-- 
-      -->
    </requires>
 
    <plugin
@@ -53,4 +51,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
index 53ec725..a0dc8c6 100644
--- a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP RCP/RAP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.rcp;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.rcp/plugin.xml b/packages/org.eclipse.epp.package.rcp/plugin.xml
index f1d2a70..a6b8242 100644
--- a/packages/org.eclipse.epp.package.rcp/plugin.xml
+++ b/packages/org.eclipse.epp.package.rcp/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse for RCP and RAP Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse for RCP and RAP Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -52,4 +52,5 @@
       </introProductBinding>
    </extension>
 
+
 </plugin>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
index dc50f6d..f09ff09 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
@@ -40,9 +40,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.7.0" />
+  <rcp version="3.6.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-indigo-SR1-RC2" />
+  <product name="eclipse-reporting-helios-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/epp.product b/packages/org.eclipse.epp.package.reporting.feature/epp.product
index f79fce5..e1ee707 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/epp.product
+++ b/packages/org.eclipse.epp.package.reporting.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.reporting.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.reporting.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 92ec850..21728d3 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.reporting.feature"
       label="EPP Reporting Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.reporting">
 
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -27,8 +27,8 @@
    <requires>
       <import feature="org.eclipse.cvs" version="1.1.0"/>
       <import feature="org.eclipse.help" version="1.1.0"/>
-      <import feature="org.eclipse.jdt" version="3.7.0"/>
-      <import feature="org.eclipse.platform" version="3.7.0"/>
+      <import feature="org.eclipse.jdt" version="3.6.0"/>
+      <import feature="org.eclipse.platform" version="3.6.0"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
       <import feature="org.eclipse.mylyn.bugzilla_feature"/>
@@ -85,4 +85,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
index 47adfe8..87a5884 100644
--- a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Reporting Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.reporting;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.reporting/plugin.xml b/packages/org.eclipse.epp.package.reporting/plugin.xml
index 393ec6c..a6a8743 100644
--- a/packages/org.eclipse.epp.package.reporting/plugin.xml
+++ b/packages/org.eclipse.epp.package.reporting/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse IDE for Java and Report Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse IDE for Java and Report Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -51,5 +51,6 @@
             productId="org.eclipse.epp.package.reporting.product">
       </introProductBinding>
    </extension>
+   
 
 </plugin>
diff --git a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
index 56550d9..20d2287 100644
--- a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
@@ -35,9 +35,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="3.7.0" />
+	<rcp version="3.6.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-soa-indigo-SR1-RC2-incubation" />
+	<product name="eclipse-soa-helios-SR1-RC4-incubation" />
 
 </configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.soa.feature/epp.product b/packages/org.eclipse.epp.package.soa.feature/epp.product
index 3f78895..cb4fed6 100644
--- a/packages/org.eclipse.epp.package.soa.feature/epp.product
+++ b/packages/org.eclipse.epp.package.soa.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for SOA Developers" uid="epp.package.soa" id="org.eclipse.epp.package.soa.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for SOA Developers" uid="epp.package.soa" id="org.eclipse.epp.package.soa.product" application="org.eclipse.ui.ide.workbench" version="1.3.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -48,7 +48,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.soa.feature" version="1.4.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.soa.feature" version="1.3.1.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.soa.feature/feature.xml b/packages/org.eclipse.epp.package.soa.feature/feature.xml
index a25129b..12ab556 100644
--- a/packages/org.eclipse.epp.package.soa.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.soa.feature"
       label="EPP SOA Feature"
-      version="1.4.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="Eclipse.org - EPP"
       plugin="org.eclipse.epp.package.soa">
 
@@ -16,8 +16,8 @@
    </license>
 
    <url>
-      <discovery label="Indigo" url="http://download.eclipse.org/releases/indigo/"/>
-      <discovery label="Eclipse Platform 3.7" url="http://download.eclipse.org/eclipse/updates/3.7"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -29,8 +29,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.jdt"/>
       <import feature="org.eclipse.pde"/>
       <import feature="org.eclipse.mylyn_feature"/>
@@ -57,4 +57,5 @@
          install-size="0"
          version="0.0.0"/>
 
+
 </feature>
diff --git a/packages/org.eclipse.epp.package.soa/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.soa/META-INF/MANIFEST.MF
index aeb003e..feb36e9 100644
--- a/packages/org.eclipse.epp.package.soa/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.soa/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP SOA Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.soa;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.soa/plugin.xml b/packages/org.eclipse.epp.package.soa/plugin.xml
index 183cf13..5f75fb9 100644
--- a/packages/org.eclipse.epp.package.soa/plugin.xml
+++ b/packages/org.eclipse.epp.package.soa/plugin.xml
@@ -17,7 +17,7 @@
          </property>
          <property
                name="aboutText"
-               value="Eclipse IDE for SOA Developers&#x0A;&#x0A;Version: Indigo Release&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
+               value="Eclipse IDE for SOA Developers&#x0A;&#x0A;Version: Helios Service Release 1&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://apache.org/">
          </property>
          <property
                name="startupProgressRect"
@@ -51,5 +51,6 @@
             productId="org.eclipse.epp.package.soa.product">
       </introProductBinding>
    </extension>
+   
 
 </plugin>
diff --git a/packages/org.eclipse.epp.package.transition.feature/feature.xml b/packages/org.eclipse.epp.package.transition.feature/feature.xml
index 4408ddf..db8cd6c 100644
--- a/packages/org.eclipse.epp.package.transition.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.transition.feature/feature.xml
@@ -23,4 +23,5 @@
       <import plugin="org.slf4j.api"/>
    </requires>
 
+
 </feature>
diff --git a/releng/org.eclipse.epp.config/packages_map.txt b/releng/org.eclipse.epp.config/packages_map.txt
index b575d43..02aea7d 100644
--- a/releng/org.eclipse.epp.config/packages_map.txt
+++ b/releng/org.eclipse.epp.config/packages_map.txt
@@ -1,43 +1,43 @@
 # EPP package definitions
-# name, [CVS], repository string, path to file, version [HEAD], EPP local filename
+# name, [CVS], repository string, path to file, version [HELIOS], EPP local filename
 
 # package definitions provided by EPP
 ## 1st: EPP package definition
 ## 2nd: feature.xml renamed
 
-cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml,HEAD,cpp.xml
-cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/feature.xml,HEAD,cpp.feature.xml
+cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml,HELIOS,cpp.xml
+cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/feature.xml,HELIOS,cpp.feature.xml
 
-java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml,HEAD,java.xml
-java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/feature.xml,HEAD,java.feature.xml
+java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml,HELIOS,java.xml
+java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/feature.xml,HELIOS,java.feature.xml
 
-javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml,HEAD,javascript.xml
-javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/feature.xml,HEAD,javascript.feature.xml
+javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml,HELIOS,javascript.xml
+javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/feature.xml,HELIOS,javascript.feature.xml
 
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml,HEAD,jee.xml
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/feature.xml,HEAD,jee.feature.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml,HELIOS,jee.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/feature.xml,HELIOS,jee.feature.xml
 
-linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml,HEAD,linuxtools.xml
-linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml,HEAD,linuxtools.feature.xml
+linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml,HELIOS,linuxtools.xml
+linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml,HELIOS,linuxtools.feature.xml
 
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml,HEAD,modeling.xml
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/feature.xml,HEAD,modeling.feature.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml,HELIOS,modeling.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/feature.xml,HELIOS,modeling.feature.xml
 
-php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml,HEAD,php.xml
-php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/feature.xml,HEAD,php.feature.xml
+php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml,HELIOS,php.xml
+php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/feature.xml,HELIOS,php.feature.xml
 
-pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml,HEAD,pulsar.xml
-pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/feature.xml,HEAD,pulsar.feature.xml
+pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml,HELIOS,pulsar.xml
+pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/feature.xml,HELIOS,pulsar.feature.xml
 
-rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml,HEAD,rcp.xml
-rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/feature.xml,HEAD,rcp.feature.xml
+rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml,HELIOS,rcp.xml
+rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/feature.xml,HELIOS,rcp.feature.xml
 
-reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml,HEAD,reporting.xml
-reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/feature.xml,HEAD,reporting.feature.xml
+reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml,HELIOS,reporting.xml
+reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/feature.xml,HELIOS,reporting.feature.xml
 
-soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml,HEAD,soa.xml
-soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/feature.xml,HEAD,soa.feature.xml
+soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml,HELIOS,soa.xml
+soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/feature.xml,HELIOS,soa.feature.xml
 
 ## special case - we provide a dummy epp config file for the SDK
-sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,sdk.xml
-#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,eclipse_sdk_360.xml
+sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HELIOS,sdk.xml
+#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HELIOS,eclipse_sdk_360.xml
diff --git a/releng/org.eclipse.epp.config/startEPP36.sh b/releng/org.eclipse.epp.config/startEPP36.sh
index 93b19bd..b8e59d6 100644
--- a/releng/org.eclipse.epp.config/startEPP36.sh
+++ b/releng/org.eclipse.epp.config/startEPP36.sh
@@ -15,7 +15,7 @@
 then
    BASE_URL=${FILESYSTEM_BASE}
    ECLIPSE="/shared/technology/epp/epp_build/36/eclipse/eclipse"
-   JRE="/opt/ibm/java2-ppc-50/bin/java"
+   JRE="/shared/common/jdk-1.5.0-22.x86_64/bin/java"
  else
    BASE_URL=${HTTP_BASE}
    ECLIPSE="eclipse"
@@ -26,7 +26,7 @@
 
 # variables to adjust
 BASE_DIR=/shared/technology/epp/epp_build/36
-RELEASE_NAME="-helios-SR1-RC2"
+RELEASE_NAME="-helios-SR1-RC4"
 
 # variables
 START_TIME=`date -u +%Y%m%d-%H%M`
@@ -138,14 +138,13 @@
       -profile ${PACKAGE} \
       -flavor tooling \
       -profileproperties org.eclipse.update.install.features=true \
-      -bundlepool ${PACKAGE_BUILD_DIR}/eclipse \
       -purgeHistory \
       -p2.os ${OSes[$index]} \
       -p2.ws ${WSes[$index]} \
       -p2.arch ${ARCHes[$index]} \
       -roaming \
       -vm ${JRE} \
-      -vmargs -Declipse.p2.mirrors=false -Declipse.p2.data.area=${PACKAGE_BUILD_DIR}/eclipse/p2 \
+      -vmargs -Declipse.p2.mirrors=false \
          2>&1 >${DOWNLOAD_DIR}/${PACKAGE}_${EXTENSION}.log
     if [ $? = "0" ]; then
       cd ${PACKAGE_BUILD_DIR}