diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 645c0ae8e20..3ebf6f408fb 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -49,6 +49,21 @@ OpenNewFolderWizardAction.tooltip=Create a folder
 OpenClassWizardAction.label=&Class
 OpenClassWizardAction.tooltip=Create a new C++ class
 
+# Editor 
+
+# Scope and Key Commands 
+scope.cEditor.name=C/C++ Editor
+cEditor.description=Editor for C/C++ Source Files
+
+category.source.name=C/C++ Source
+category.source.description= C/C++ Source Actions
+
+ActionDefinition.comment.name= Comment
+ActionDefinition.comment.description= Turn the selected lines into // style comments
+
+ActionDefinition.uncomment.name= Uncomment
+ActionDefinition.uncomment.description= Uncomment the selected // style comment lines
+
 CEditor.name=C Editor
 CPluginPreferencePage.name=C/C++
 CPluginEditorPreferencePage.name=C/C++ Editor
@@ -60,12 +75,12 @@ CApplicationLauncher.label=Executable
 CApplicationLauncher.description=Launch a local command
 CProblemMarker.name=C Problem
 
-CFolderActionSet.label=C Folder Actions
-CFolderActionSet.description=C Folder Action Set
-
 Editors.DefaultTextEditor = Default Text Editor
 AsmEditor.name = Assembly Editor
 
+CFolderActionSet.label=C Folder Actions
+CFolderActionSet.description=C Folder Action Set
+
 # Task Action
 DeleteTaskAction.label=Delete C/C++ Markers
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index a90d3c6f500..43194461a8a 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -475,6 +475,45 @@
             class="org.eclipse.cdt.internal.ui.BuildConsole">
       </CBuildConsole>
    </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <scope
+            name="%scope.cEditor.name"
+            parent="org.eclipse.ui.textEditorScope"
+            description="%cEditor.description"
+            id="org.eclipse.cdt.ui.cEditorScope">
+      </scope>
+      <category
+            name="%category.source.name"
+            descrption="%category.source.description"
+            id="org.eclipse.cdt.ui.category.source">
+      </category>
+      <command
+            name="%ActionDefinition.comment.name"
+            description="%ActionDefinition.comment.description"
+            category="org.eclipse.cdt.ui.category.source"
+            id="org.eclipse.cdt.ui.edit.text.c.comment">
+      </command>
+      <keyBinding
+            string="Ctrl+/"
+            scope="org.eclipse.cdt.ui.cEditorScope"
+            command="org.eclipse.cdt.ui.edit.text.c.comment"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <command
+            name="%ActionDefinition.uncomment.name"
+            description="%ActionDefinition.uncomment.description"
+            category="org.eclipse.cdt.ui.category.source"
+            id="org.eclipse.cdt.ui.edit.text.c.uncomment">
+      </command>
+      <keyBinding
+            string="Ctrl+\"
+            scope="org.eclipse.cdt.ui.cEditorScope"
+            command="org.eclipse.cdt.ui.edit.text.c.uncomment"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+   </extension>
+   
 <!--
    <extension
          point="org.eclipse.ui.views">