diff --git a/cross/org.eclipse.cdt.launch.remote-feature/build.properties b/cross/org.eclipse.cdt.launch.remote-feature/build.properties
index c6af93f4925..b7be1e1bd3b 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/build.properties
+++ b/cross/org.eclipse.cdt.launch.remote-feature/build.properties
@@ -3,3 +3,4 @@ bin.includes = feature.xml,\
                epl-v10.html,\
                feature.properties,\
                license.html
+generate.plugin@org.eclipse.cdt.launch.remote.source=org.eclipse.cdt.launch.remote
\ No newline at end of file
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index fcb7b656b7a..92d5a1428ef 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -27,5 +27,12 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.cdt.launch.remote.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/build.properties b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 231dfcf1486..00000000000
--- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-generate.feature@org.eclipse.cdt.gnu.build.source = org.eclipse.cdt.gnu.build
-generate.feature@org.eclipse.cdt.gnu.debug.source = org.eclipse.cdt.gnu.debug
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 410bf9062e1..00000000000
--- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.cdt.source"
-      label="%featureName"
-      version="5.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/galileo"/>
-   </url>
-
-   <includes
-         id="org.eclipse.cdt.gnu.build.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.cdt.gnu.debug.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.cdt.source"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.aix.motif.ppc"
-         os="aix"
-         ws="motif"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.linux.gtk.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.linux.gtk.x86_64"
-         os="linux"
-         ws="gtk"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.linux.gtk.ppc"
-         os="linux"
-         ws="gtk"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.linux.gtk.ia64"
-         os="linux"
-         ws="gtk"
-         arch="ia64"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.macosx.carbon.ppc"
-         os="macosx"
-         ws="carbon"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.qnx.photon.x86"
-         os="qnx"
-         ws="photon"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.solaris.motif.sparc"
-         os="solaris"
-         ws="motif"
-         arch="sparc"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.cdt.source.win32.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="5.0.0.qualifier"
-         fragment="true"/>
-
-</feature>
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplatePlugin/build.properties b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 811ba521d76..00000000000
--- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
-src.includes = about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               plugin.xml,\
-               plugin.properties
-sourcePlugin=true