diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 74eeaa3c788..94948451761 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -125,7 +125,7 @@
 </context>
 <context id ="c_editor_hov">
    <description>Click below to see help.</description>
-   <topic href="cdt_u_c_editor_hov.htm"
+   <topic href="reference/cdt_u_c_editor_hov.htm"
    	label="Editor Hovers Preferences"/>
 </context>
 <context id ="c_editor_navigation">
@@ -175,7 +175,7 @@
 </context>
 <context id ="man_prop_build">
    <description>Click below to see help.</description>
-   <topic href="cdt_u_mprop_build.htm"
+   <topic href="reference/cdt_u_mprop_build.htm"
    	label="Build"/>
 </context>
 <context id ="man_prop_file_types">
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
index 237ec12b472..a603e9bf8c3 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
@@ -52,4 +52,10 @@
    	label="&sourcePage;"/>
 </context>
 
+<context id ="run_dbg_comm">
+   <description>Click below to see help.</description>
+   <topic href="reference/run_dbg_comm"
+   	label="Common"/>
+</context>
+
 </contexts>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
index 6e1cc71a9b0..cad4a1558cc 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
@@ -18,7 +18,21 @@
    <topic href="default_cs_help.htm"
    	label="&defaultCSHelp;"/>
 </context>
-
+<context id ="newproj_buildset">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_newproj_buildset.htm"
+	label="Make Builder"/>
+</context>
+<context id ="discovery_preferences">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_discovery_preferences.htm"
+   	label="Discovery Options"/>
+</context>					
+<context id ="std_prop_discovery">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_sprop_mdiscovery.htm"
+   	label="Discovery Options"/>
+</context>
 <context id ="cdt_make_builder_page">
    <description>Define the build settings for the current project. </description>
    <topic href="reference/cdt_u_newproj_buildset.htm"
@@ -30,5 +44,70 @@
    <topic href="reference/cdt_u_newproj_pathsymb.htm"
    	label="&pathsSymbols;"/>
 </context>
+<context id ="make_targets_view">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_make_targets_view.htm"
+   	label="Make Targets view"/>
+</context>
+<context id ="new_proj_wiz_s_name">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_name.htm"
+   	label="Name"/>
+</context>
+<context id ="new_proj_wiz_s_proj">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_proj.htm"
+   	label="Referenced Projects"/>
+</context>
+<context id ="new_proj_wiz_s_mbuilder">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_mbuilder.htm"
+   	label="Make Builder"/>
+</context>
+<context id ="new_proj_wiz_s_errorp">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_errorp.htm"
+   	label="Error Parsers"/>
+</context>
+<context id ="new_proj_wiz_s_binary">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_binary.htm"
+   	label="Binary Parser"/>
+</context>
+<context id ="new_proj_wiz_s_discovery">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_discovery.htm"
+   	label="Discovery Options"/>
+</context>
+<context id ="new_proj_wiz_s_cindexer">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_new_proj_wiz_s_cindexer.htm"
+   	label="C/C++ Indexer"/>
+</context>
+<context id ="std_prop_build">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_sprop_mbuild.htm"
+   	label="Make Builder"/>
+</context>
+<context id ="std_prop_error">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_sprop_merror.htm"
+   	label="Error Parser"/>
+</context>
+<context id ="std_prop_binary">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_sprop_mbinary.htm"
+   	label="Binary Parser"/>
+</context>
+<context id ="newproj_parser_error">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_newproj_parser_error.htm"
+   	label="Error Parser"/>
+</context>
+<context id ="newproj_parser_binary">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_newproj_parser_binary.htm"
+   	label="Binary Parser"/>
+</context>
 
 </contexts>