diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 716bba83cd5..fcb7b656b7a 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.launch.remote"
       label="%featureName"
-      version="1.0.0"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index 90f2499d06e..bcad95f35ed 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -89,4 +89,8 @@
          id="org.eclipse.cdt.debug.ui.memory"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.launch.remote"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index aaed7c45f82..2d0f953eca0 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -123,3 +123,7 @@ plugin@org.eclipse.cdt.debug.ui.memory.transport=@cdtTag@,:pserver:anonymous@dev
 plugin@org.eclipse.cdt.debug.ui.memory.search=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.search
 plugin@org.eclipse.cdt.debug.ui.memory.memorybrowser=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser
 feature@org.eclipse.cdt.debug.ui.memory=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory-feature
+
+! CDT RSE Remote Launch
+plugin@org.eclipse.cdt.launch.remote=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/cross/org.eclipse.cdt.remote.launch
+feature@org.eclipse.cdt.launch.remote=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/cross/org.eclipse.cdt.remote.launch-feature
\ No newline at end of file