diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 597fdf4f5d6..028804ac57e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-06 Alain Magloire
+	Fix PR 98182
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/LocationBreakpoint.java
+
 2005-05-25 Alain Magloire
 	Fix PR 95705
 	* mi/org/eclipse/cdt/debug/mi/core/output/MIInfoSharedLibraryInfo.java
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 ad1c37b00fb..09733271c54 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
@@ -31,6 +31,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIFunctionBreakpoint;
 import org.eclipse.cdt.debug.core.cdi.model.ICDILineBreakpoint;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
 import org.eclipse.cdt.debug.mi.core.MIException;
+import org.eclipse.cdt.debug.mi.core.MIFormat;
 import org.eclipse.cdt.debug.mi.core.MISession;
 import org.eclipse.cdt.debug.mi.core.cdi.model.AddressBreakpoint;
 import org.eclipse.cdt.debug.mi.core.cdi.model.AddressLocation;
@@ -422,12 +423,32 @@ public class BreakpointManager extends Manager {
 					wpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
 					bList.add(wpoint);
 				} else {
-					LineLocation location = new LineLocation (allMIBreakpoints[i].getFile(),
-							allMIBreakpoints[i].getLine());
-					// By default new breakpoint are LineBreakpoint
-					Breakpoint newBreakpoint = new LineBreakpoint(target, type, location, condition);
-					newBreakpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
-					bList.add(newBreakpoint);
+					String function = allMIBreakpoints[i].getFunction();
+					String file = allMIBreakpoints[i].getFile();
+					int line = allMIBreakpoints[i].getLine();
+					String addr = allMIBreakpoints[i].getAddress();
+
+					if (file != null && file.length() > 0 && line > 0) {
+						LineLocation location = createLineLocation (allMIBreakpoints[i].getFile(),
+								allMIBreakpoints[i].getLine());
+						// By default new breakpoint are LineBreakpoint
+						Breakpoint newBreakpoint = new LineBreakpoint(target, type, location, condition);
+						newBreakpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
+						bList.add(newBreakpoint);
+					} else if (function != null && function.length() > 0) {
+						FunctionLocation location = createFunctionLocation(file, function);
+						// By default new breakpoint are LineBreakpoint
+						Breakpoint newBreakpoint = new FunctionBreakpoint(target, type, location, condition);
+						newBreakpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
+						bList.add(newBreakpoint);
+					} else if (addr != null && addr.length() > 0) {
+						BigInteger big = MIFormat.getBigInteger(addr);
+						AddressLocation location = createAddressLocation (big);
+						// By default new breakpoint are LineBreakpoint
+						Breakpoint newBreakpoint = new AddressBreakpoint(target, type, location, condition);
+						newBreakpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
+						bList.add(newBreakpoint);
+					}
 				}
 				eventList.add(new MIBreakpointCreatedEvent(miSession, no)); 
 			}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
index 0814000fba4..e06671ce10c 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
@@ -59,6 +59,7 @@ public abstract class LocationBreakpoint extends Breakpoint implements ICDIBreak
 			if (a != null) {
 				addr = MIFormat.getBigInteger(a);
 			}
+			return addr;
 		} else if (fLocation instanceof ICDIAddressLocation) {
 			return ((ICDIAddressLocation)fLocation).getAddress();
 		}