--- a/core/com.nokia.carbide.cpp/plugin.properties	Wed Jun 17 14:22:41 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Wed Jun 17 14:23:16 2009 -0500
@@ -5,6 +5,7 @@
 
 CHEAT_SHEETS = Cheat Sheets
 CHEAT_SHEETS_MENU = &Cheat Sheets...
+
 productBlurb=Build {0} {1}\n\
 Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://www.forum.nokia.com/\n\
@@ -12,3 +13,6 @@
 Visit http://www.eclipse.org/
 
 theme.name.carbide = Carbide
+
+carbcPreference.common=carbide symbian cpp cplusplus
+carbcPreference.diagnostics=diagnostic logs
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp/plugin.xml	Wed Jun 17 14:22:41 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Wed Jun 17 14:23:16 2009 -0500
@@ -516,6 +516,7 @@
 		   
 		</theme>
 	</extension>
+	
  <extension point="com.nokia.carbide.cpp.diagnosticLogGroup">
    <diagnosticLogGroup
            id="com.nokia.carbide.cpp.diagnosticLogs"
@@ -530,6 +531,12 @@
           class="com.nokia.carbide.cpp.logging.LoggingPreferencesPage"
           id="com.nokia.carbide.cpp.LoggingPreferencesPage"
           name="Diagnostic Logs">
+       <keywordReference
+             id="com.nokia.carbide.cpp.common">
+       </keywordReference>
+       <keywordReference
+             id="com.nokia.carbide.cpp.diagnostics">
+       </keywordReference>
     </page>
  </extension>
 
@@ -559,5 +566,21 @@
          </enabledWhen>
       </page>
    </extension>
+   
+<!-- =================================================================================== -->
+<!-- Carbide preference panel keywords                                                   -->
+<!-- =================================================================================== -->
+
+ <extension
+       point="org.eclipse.ui.keywords">
+    <keyword
+          id="com.nokia.carbide.cpp.common"
+          label="%carbcPreference.common">
+    </keyword>
+    <keyword
+          id="com.nokia.carbide.cpp.diagnostics"
+          label="%carbcPreference.diagnostics">
+    </keyword>
+ </extension>
 
 </plugin>