diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
index c98c6000d25..cbb893728a6 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
@@ -727,6 +727,12 @@ public class BreakpointManager extends Manager {
 						points[j].setFile(bkpt.getFile());
 					}					
 				}
+				if (bkpt.getLineNumber()>0)	{
+					for (int j = 0; j < points.length; j++) {
+						if (points[j].getLine() == 0)
+							points[j].setLine(bkpt.getLineNumber());
+					}				
+				}
 				// Make sure that if the breakpoint was disable we create them disable.
 				if (!enable) {
 					int[] numbers = new int[points.length];
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java
index 087e2380545..41a918b4b30 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java
@@ -263,4 +263,8 @@ public class MIBreakpoint {
 	public void setFile(String file) {
 		this.file = file;
 	}
+	
+	public void setLine(int line) {
+		this.line = line;
+	}
 }