diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index 3aa0bb1b454..1a1c48a61f5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -15,6 +15,9 @@
          <buildIdPattern
                pattern="cdt\.managedbuild\.config\.gnu\..*">
          </buildIdPattern>
+         <buildIdPattern
+               pattern="cdt\.managedbuild\.toolchain\.gnu\..*">
+         </buildIdPattern>
       </debugger>
       <debugger
             platform="*"
@@ -33,6 +36,9 @@
          <buildIdPattern
                pattern="cdt\.managedbuild\.config\.gnu\.mingw\..*">
          </buildIdPattern>
+         <buildIdPattern
+               pattern="cdt\.managedbuild\.toolchain\.gnu\.mingw\..*">
+         </buildIdPattern>
       </debugger>
    </extension>
    <extension