diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 785390c4cfb..b524ebe3213 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-09 Mikhail Khodjaiants
+	Bug 114793: Add an extension point to contribute command factories.
+	Registered windows and linux specific command factories for gdbserver.
+	* plugin.properties
+	* plugin.xml
+
 2006-02-09 Mikhail Khodjaiants
 	The inferior is in the suspended state when connecting to gsbserver.
 	* GDBServerCDIDebugger2.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
index 0fb0313036a..028c8d72d5e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
@@ -17,6 +17,6 @@ GDBServer.name=gdbserver Debugger
 GDBMIDebugger.name=gdb/mi
 
 StandardCommandFactory.name=Standard
-StandardLinuxCommandFactory.name=Standard
-StandardWindowsCommandFactory.name=Standard
+StandardLinuxCommandFactory.name=Standard (Linux)
+StandardWindowsCommandFactory.name=Standard (Windows)
 CygWinCommandFactory.name=CygWin
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index 25aafcb94ba..726e484115a 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -71,6 +71,27 @@
             miVersions="mi,mi1,mi2"
             name="%StandardCommandFactory.name"
             platforms="*"/>
+      <commandFactory
+            class="org.eclipse.cdt.debug.mi.core.command.factories.win32.StandardWinCommandFactory"
+            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"
+            id="org.eclipse.cdt.debug.mi.core.standardWinCommandFactory"
+            miVersions="mi,mi1,mi2"
+            name="%StandardWindowsCommandFactory.name"
+            platforms="win32"/>
+      <commandFactory
+            class="org.eclipse.cdt.debug.mi.core.command.factories.win32.CygwinCommandFactory"
+            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"
+            id="org.eclipse.cdt.debug.mi.core.cygwinCommandFactory"
+            miVersions="mi,mi1,mi2"
+            name="%CygWinCommandFactory.name"
+            platforms="win32"/>
+      <commandFactory
+            class="org.eclipse.cdt.debug.mi.core.command.factories.linux.StandardLinuxCommandFactory"
+            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"
+            id="org.eclipse.cdt.debug.mi.core.standardLinuxCommandFactory"
+            miVersions="mi,mi1,mi2"
+            name="%StandardLinuxCommandFactory.name"
+            platforms="linux"/>
    </extension>
 
 </plugin>