diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index e9159c0590f..649928b1d6c 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-10 Mikhail Khodjaiants
+	Added contributions of the breakpoint actions to the disassembly editor.
+	* DisassemblyEditor.java
+	* plugin.xml
+
 2003-01-10 Mikhail Khodjaiants
 	Implementation of address breakpoints.
 	* CDebugImages.java
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 176cbe6437a..f2fa8828d1c 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -517,6 +517,92 @@
                id="org.eclipse.cdt.debug.internal.ui.actions.NaturalVariableFormatActionDelegate">
          </action>
       </objectContribution>
+      <viewerContribution
+            targetID="#DisassemblyEditorRulerContext"
+            id="org.eclipse.cdt.debug.ui.DisassemblyEditorRulerActions">
+<!--
+         <action
+               label="%RunToLineAction.label"
+               icon="icons/full/clcl16/runtoline_co.gif"
+               helpContextId="run_to_line_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.RunToLineRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.cdt.debug.internal.ui.actions.RunToLineRulerActionDelegate">
+         </action>
+-->
+         <action
+               label="%BreakpointProperties.label"
+               helpContextId="breakpoint_properties_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CBreakpointPropertiesRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.cdt.debug.internal.ui.actions.CBreakpointPropertiesRulerActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+         <action
+               label="%EnableBreakpoint.label"
+               helpContextId="enable_disable_breakpoint_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.cdt.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+         <action
+               label="%AddBreakpoint.label"
+               helpContextId="manage_breakpoint_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#DisassemblyEditorContext"
+            id="org.eclipse.cdt.debug.ui.DisassemblyEditorPopupActions">
+         <action
+               label="%AddExpressionAction.label"
+               icon="icons/full/obj16/expression_obj.gif"
+               helpContextId="add_expression_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.AddExpressionActionDelegate"
+               menubarPath="additions"
+               id="org.eclipse.cdt.debug.internal.ui.actions.AddExpressionActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+         <action
+               label="%RunToLineAction.label"
+               icon="icons/full/clcl16/runtoline_co.gif"
+               helpContextId="run_to_line_action_context"
+               class="org.eclipse.cdt.debug.internal.ui.actions.RunToLineActionDelegate"
+               menubarPath="additions"
+               enablesFor="1"
+               id="org.eclipse.cdt.debug.internal.ui.actions.RunToLineActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+      </viewerContribution>
    </extension>
    <extension
          point="org.eclipse.ui.viewActions">
@@ -657,6 +743,38 @@
             </enablement>
          </action>
       </editorContribution>
+      <editorContribution
+            targetID="org.eclipse.cdt.ui.editor.asm.AsmEditor"
+            id="org.eclipse.cdt.ui.editor.asm.AsmEditor.BreakpointRulerActions">
+         <action
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
+               actionID="RulerDoubleClick"
+               label="%Dummy.label"
+               id="org.eclipse.cdt.debug.ui.CEditor.ManageBreakpointRulerAction">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
+               </pluginState>
+            </enablement>
+         </action>
+      </editorContribution>
+      <editorContribution
+            targetID="org.eclipse.cdt.debug.ui.DisassemblyEditor"
+            id="org.eclipse.cdt.debug.ui.DisassemblyEditor.BreakpointRulerActions">
+         <action
+               actionID="RulerDoubleClick"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
+               label="%Dummy.label"
+               id="org.eclipse.cdt.debug.ui.CEditor.ManageBreakpointRulerAction">
+            <enablement>
+               <pluginState
+                     id="org.eclipse.cdt.debug.ui"
+                     value="activated">
+               </pluginState>
+            </enablement>
+         </action>
+      </editorContribution>
    </extension>
    <extension
          point="org.eclipse.cdt.ui.textHovers">
@@ -725,8 +843,8 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            extensions="dasm"
             icon="icons/full/obj16/disassembly_obj.gif"
+            extensions="dasm"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyEditor.java
index 4b7b7c093b5..6f6c4afaa81 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyEditor.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyEditor.java
@@ -22,5 +22,7 @@ public class DisassemblyEditor extends AsmTextEditor
 	{
 		super();
 		setDocumentProvider( CDebugUIPlugin.getDefault().getDisassemblyDocumentProvider() );
+		setEditorContextMenuId("#DisassemblyEditorContext"); //$NON-NLS-1$
+		setRulerContextMenuId("#DisassemblyEditorRulerContext"); //$NON-NLS-1$
 	}
 }