diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index 5b3cde17ee0..5c864ae3a3e 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -23,7 +23,7 @@ plugin@org.eclipse.rse.examples.tutorial=v20061109,:pserver:anonymous:none@dev.e
 plugin@org.eclipse.rse.files.ui=v20061110,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
 plugin@org.eclipse.rse.logging=v20061031,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
 plugin@org.eclipse.rse.processes.ui=v20061110b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.remotecdt=v20061110b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt
+plugin@org.eclipse.rse.remotecdt=v20061110c,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt
 plugin@org.eclipse.rse.sdk=v20061031,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
 plugin@org.eclipse.rse.services.dstore=v20061110,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
 plugin@org.eclipse.rse.services.files.ftp=v20061108,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
diff --git a/rse/examples/org.eclipse.rse.remotecdt/HelpContexts.xml b/rse/examples/org.eclipse.rse.remotecdt/HelpContexts.xml
new file mode 100644
index 00000000000..8401379b6d7
--- /dev/null
+++ b/rse/examples/org.eclipse.rse.remotecdt/HelpContexts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<!--
+Copyright (c) 2006 Wind River Systems, Inc.
+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: 
+Martin Oberhuber (Wind River) - initial API and implementation  
+-->
+<contexts>
+  <context id="launchgroup">
+  <description>The Remote CDT Launch Tab Group allows you to specify the connection, program and properties of a program to launch and debug on a remote system.
+  </description>
+  <topic href="remotecdt.html" label="Launching Remote C/C++ Applications"/>
+</context>
+	
+</contexts>
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.remotecdt/build.properties b/rse/examples/org.eclipse.rse.remotecdt/build.properties
index 290d5997270..f1908ea166c 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/build.properties
+++ b/rse/examples/org.eclipse.rse.remotecdt/build.properties
@@ -8,6 +8,7 @@
 # Contributors: 
 # Ewa Matejska (PalmSource)
 # Martin Oberhuber (Wind River) - fix 158529: Migrate docs to HTML / TOC format 
+# Martin Oberhuber (Wind River) - add help contexts 
 #####################################################################################
 
 source.. = src/
@@ -22,6 +23,7 @@ bin.includes = META-INF/,\
                plugin.xml,\
                remotecdt.html,\
                toc.xml,\
+               HelpContexts.xml,\
                icons/,\
                .
 src.includes = META-INF/,\
diff --git a/rse/examples/org.eclipse.rse.remotecdt/plugin.xml b/rse/examples/org.eclipse.rse.remotecdt/plugin.xml
index 717f423aec6..756405b8f2a 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/plugin.xml
+++ b/rse/examples/org.eclipse.rse.remotecdt/plugin.xml
@@ -35,11 +35,19 @@ Martin Oberhuber (Wind River) - fix 158529: Migrate docs to HTML / TOC format
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
             class="org.eclipse.rse.remotecdt.RemoteLaunchConfigurationTabGroup"
-            id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup">
+            helpContextId="org.eclipse.rse.remotecdt.launchgroup"
+            id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
+            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
       </launchConfigurationTabGroup>
    </extension>
+
+	<!-- ============================================ -->
+	<!-- Define Help Context                          -->
+	<!-- ============================================ -->
+	<extension point="org.eclipse.help.contexts">
+  		<contexts file="HelpContexts.xml"/>
+	</extension>
 	<extension point="org.eclipse.help.toc">
 		<toc file="toc.xml"/>
 	</extension>
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java
index e7bfa0d9409..696488f9dd0 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java
+++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java
@@ -16,11 +16,24 @@ import java.util.List;
 
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
+import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.cdt.launch.ui.CDebuggerTab;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.swt.widgets.Composite;
 
 public class RemoteCDebuggerTab extends CDebuggerTab {
 	
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(),
+			"org.eclipse.rse.remotecdt.launchgroup"); //$NON-NLS-1$
+	}
+
+	public String getName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	static final private String GDBSERVER_DEBUGGER_NAME = "gdb/mi"; //$NON-NLS-1$
 	
 	public RemoteCDebuggerTab(boolean attachMode) {
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java
index 945e55bda0b..05c65af072e 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java
+++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java
@@ -93,7 +93,10 @@ public class RemoteCMainTab extends CMainTab {
 				setLocalPathForRemotePath();
 			}
 		});
-		
+
+		LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(),
+				"org.eclipse.rse.remotecdt.launchgroup"); //$NON-NLS-1$
+
 		LaunchUIPlugin.setDialogShell(parent.getShell());
     }