diff --git a/terminal/org.eclipse.tm.terminal.view/HelpContexts.xml b/terminal/org.eclipse.tm.terminal.view/HelpContexts.xml
index 4100b7979da..5ba920568af 100644
--- a/terminal/org.eclipse.tm.terminal.view/HelpContexts.xml
+++ b/terminal/org.eclipse.tm.terminal.view/HelpContexts.xml
@@ -12,7 +12,7 @@ Martin Oberhuber (Wind River) - initial API and implementation
 -->
 <contexts>
   <context id="terminal_page">
-    <description>The Terminal View supports direct connections to target boards via serial or network connections.
+    <description>The Terminal View supports direct connections to remote systems via serial or network connections.
     </description>
     <topic label="Terminal View" href="doc/html/01_terminalview.html" />
     <topic label="Terminal Emulation" href="doc/html/04_terminal_emulation.html" />
diff --git a/terminal/org.eclipse.tm.terminal.view/TerminalContexts.xml b/terminal/org.eclipse.tm.terminal.view/TerminalContexts.xml
new file mode 100644
index 00000000000..387756f5c68
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.view/TerminalContexts.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<!--
+Copyright (c) 2008 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="terminal_view">
+    <topic label="Terminal View" href="doc/html/01_terminalview.html" />
+    <topic label="Terminal Emulation" href="doc/html/04_terminal_emulation.html" />
+    <topic label="Terminal View Quick Reference" href="doc/html/02_terminal_page.html#terminal_page"/>
+  </context>
+</contexts>
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.view/plugin.xml b/terminal/org.eclipse.tm.terminal.view/plugin.xml
index 504ec8b41e3..3a26546d85a 100644
--- a/terminal/org.eclipse.tm.terminal.view/plugin.xml
+++ b/terminal/org.eclipse.tm.terminal.view/plugin.xml
@@ -83,6 +83,7 @@
 	<!-- ============================================ -->
 	<extension point="org.eclipse.help.contexts">
   		<contexts file="HelpContexts.xml"/>
+  		<contexts file="TerminalContexts.xml" plugin="org.eclipse.tm.terminal"/> 
 	</extension>
 	<extension point="org.eclipse.help.toc">
 		<toc file="toc.xml"/>
diff --git a/terminal/org.eclipse.tm.terminal/HelpContexts.xml b/terminal/org.eclipse.tm.terminal/HelpContexts.xml
new file mode 100644
index 00000000000..761da672632
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal/HelpContexts.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<!--
+Copyright (c) 2008 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="terminal_view">
+    <description>The Terminal View supports direct connections to remote systems via serial or network connections.
+    </description>
+  </context>
+</contexts>
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal/plugin.xml b/terminal/org.eclipse.tm.terminal/plugin.xml
index aae86a7c5c7..ce1bd3b4f33 100644
--- a/terminal/org.eclipse.tm.terminal/plugin.xml
+++ b/terminal/org.eclipse.tm.terminal/plugin.xml
@@ -21,4 +21,7 @@
             id="org.eclipse.tm.terminal.TerminalContext"
             />
    </extension>
+	<extension point="org.eclipse.help.contexts">
+  		<contexts file="HelpContexts.xml"/>
+	</extension>
 </plugin>