diff --git a/terminals-eclipse-4.4.x-luna.target b/terminals-eclipse-4.4.x-luna.target
index 48acdfa1fe9..f2688fc3852 100644
--- a/terminals-eclipse-4.4.x-luna.target
+++ b/terminals-eclipse-4.4.x-luna.target
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="65">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="69">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201502160819"/>
-<repository location="http://download.eclipse.org/tm/updates/3.7milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.1.v20140901-1055"/>
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.5.0.201409172108"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/8.5"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
@@ -26,8 +18,13 @@
 <repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="1.1.1.201502102040"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/1.1.1"/>
+<unit id="org.eclipse.cdt.native.source.feature.group" version="8.5.0.201409172108"/>
+<unit id="org.eclipse.cdt.native.feature.group" version="8.5.0.201409172108"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.5"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201502160819"/>
+<repository location="http://download.eclipse.org/tm/updates/3.7milestones"/>
 </location>
 </locations>
 </target>
diff --git a/terminals.psf b/terminals.psf
index 70509882568..b9d161745cc 100644
--- a/terminals.psf
+++ b/terminals.psf
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.eclipse.egit.core.GitProvider">
+<project reference="1.0,http://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git,R1_1_maintenance,features/org.eclipse.remote-feature"/>
+<project reference="1.0,http://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git,R1_1_maintenance,bundles/org.eclipse.remote.core"/>
+<project reference="1.0,http://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git,R1_1_maintenance,bundles/org.eclipse.remote.jsch.core"/>
+<project reference="1.0,http://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git,R1_1_maintenance,bundles/org.eclipse.remote.jsch.ui"/>
+<project reference="1.0,http://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git,R1_1_maintenance,bundles/org.eclipse.remote.ui"/>
 <project reference="1.0,http://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git,master,terminals/plugins/org.eclipse.tcf.te.core.terminals"/>
 <project reference="1.0,http://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git,master,terminals/features/org.eclipse.tcf.te.terminals.feature"/>
 <project reference="1.0,http://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git,master,terminals/features/org.eclipse.tcf.te.terminals.rse.feature"/>
@@ -30,6 +35,15 @@
 <project reference="1.0,http://git.eclipse.org/gitroot/tm/org.eclipse.tm.git,master,terminal/features/org.eclipse.tm.terminal.telnet.sdk.feature"/>
 <project reference="1.0,http://git.eclipse.org/gitroot/tm/org.eclipse.tm.git,master,terminal/plugins/org.eclipse.tm.terminal.test"/>
 </provider>
+<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424180520433_7" label="Remote Services" name="Remote Services">
+<item elementID="=org.eclipse.remote.jsch.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.remote.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.remote.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.remote.jsch.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+</workingSets>
+<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424180691591_8" label="Remote Services (Features)" name="Remote Services (Features)">
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.remote-feature" type="4"/>
+</workingSets>
 <workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167614352_4" label="Terminal Control" name="Terminal Control">
 <item elementID="=org.eclipse.tm.terminal.remote" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.tm.terminal.ssh" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>