diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/CommandFactoryDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/CommandFactoryDescriptor.java
index b8912002a00..f355eae30ba 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/CommandFactoryDescriptor.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/CommandFactoryDescriptor.java
@@ -114,7 +114,7 @@ public class CommandFactoryDescriptor {
 
 	public boolean supportsPlatform( String platform ) {
 		Set all = getSupportedPlatforms();
-		return all.isEmpty() || all.contains( platform );
+		return all.isEmpty() || all.contains( "*" ) || all.contains( platform ); //$NON-NLS-1$
 	}
 
 	public String[] getSupportedPlatformList() {