diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 25d04fc5613..c296710ea37 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -476,6 +476,7 @@
            name="%LanguageSettingsProvidersTab.name"
            parent="org.eclipse.cdt.make.internal.ui.preferences.BuildSettingsPreferencePage"
            tooltip="%LanguageSettingsProvidersTab.tooltip"
+           helpId="cdt_u_pref_build_scanner_discovery"
            weight="040">
      </tab>
    </extension>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index d1123c258a0..f9e6ad59d8c 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -4479,6 +4479,7 @@
 			name="%AllLanguageSettingEntries.name"
 			weight="010"
 			parent="org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProvidersPage"
+			helpId="cdt_u_prop_general_sd_entries"
 			tooltip="%AllLanguageSettingEntries.tooltip"/>
 		<tab
 			class="org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab"
@@ -4486,6 +4487,7 @@
 			name="%AllLanguageSettingProviders.name"
 			weight="020"
 			parent="org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProvidersPage"
+			helpId="cdt_u_prop_general_sd_providers"
 			tooltip="%AllLanguageSettingEntries.tooltip"/>
 	</extension>
  <extension
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 50671d14402..3e85661b990 100755
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -147,6 +147,21 @@
    <topic href="reference/cdt_u_discovery_preferences.htm"
    	label="Discovery Options"/>
 </context>
+<context id ="cdt_u_pref_build_scanner_discovery">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_pref_build_scanner_discovery.htm"
+   	label="Scanner Discovery Preferences"/>
+</context>
+<context id ="cdt_u_prop_general_sd_entries">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_prop_general_sd_entries.htm"
+   	label="Scanner Discovery Entries Tab"/>
+</context>
+<context id ="cdt_u_prop_general_sd_providers">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_prop_general_sd_providers.htm"
+   	label="Scanner Discovery Providers Tab"/>
+</context>
 <context id ="man_prop_indexer">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_prop_general_idx.htm"