diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 727bf1f087c..5f3cd1e0ae8 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
-Bundle-Version: 8.5.0.qualifier
+Bundle-Version: 8.6.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
index 1702cec334d..f7b45fbd549 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
@@ -385,9 +385,22 @@ public class CDebugUtils {
 		appendExtensionMessage(breakpoint, label);
 		appendIgnoreCount(breakpoint, label);
 		appendCondition(breakpoint, label);
+		appendModule(breakpoint, label);
 		return label.toString();
 	}
 
+	/**
+	 * @since 8.6
+	 */
+	protected static void appendModule(ICAddressBreakpoint breakpoint, StringBuffer buffer) throws CoreException {
+		String module = breakpoint.getModule();
+		if (module != null && module.length() > 0) {
+			buffer.append(' ');
+			buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.9"), //$NON-NLS-1$
+					(Object[]) new String[] { module }));
+		}
+	}
+
 	protected static String getFunctionBreakpointText(ICFunctionBreakpoint breakpoint, boolean qualified)
 			throws CoreException {
 		StringBuffer label = new StringBuffer();
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
index 5ebe8ba74f2..cf89878f9dd 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
@@ -23,6 +23,7 @@ CDebugUtils.5=[expression: ''{0}'']
 CDebugUtils.6=[memory space: {0}]
 CDebugUtils.7=[units: {0}]
 CDebugUtils.8=[type: {0}]
+CDebugUtils.9=[module: {0}]
 CDebugUtils.printfString=[{0}]
 CDebugUtils.Regular=Regular
 CDebugUtils.Hardware=Hardware