diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index c36102541d8..35336247eca 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-08 Mikhail Khodjaiants
+	Bug 114793: Add an extension point to contribute command factories.
+	Added standard command factory for gdb server.
+	* plugin.xml
+	* plugin.properties
+	
 2006-02-07 Mikhail Khodjaiants
 	Bug 114793: Add an extension point to contribute command factories.
 	+ mi/org/eclipse/cdt/debug/mi/core/command/factories/linux (package)
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
index b715e5cca4c..0fb0313036a 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
@@ -16,6 +16,7 @@ CygwinGDBDebugger.name=Cygwin gdb Debugger
 GDBServer.name=gdbserver Debugger
 GDBMIDebugger.name=gdb/mi
 
+StandardCommandFactory.name=Standard
 StandardLinuxCommandFactory.name=Standard
 StandardWindowsCommandFactory.name=Standard
 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 173a7cf3aa3..25aafcb94ba 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -60,10 +60,17 @@
       <commandFactory
             class="org.eclipse.cdt.debug.mi.core.command.factories.linux.StandardLinuxCommandFactory"
             debuggerID="org.eclipse.cdt.debug.mi.core.CDebuggerNew"
-            id="org.eclipse.cdt.debug.mi.core.standardLinuxCommandFactory1"
+            id="org.eclipse.cdt.debug.mi.core.standardLinuxCommandFactory"
             miVersions="mi,mi1,mi2"
             name="%StandardLinuxCommandFactory.name"
             platforms="linux"/>
+      <commandFactory
+            class="org.eclipse.cdt.debug.mi.core.command.factories.StandardCommandFactory"
+            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"
+            id="org.eclipse.cdt.debug.mi.core.standardCommandFactory"
+            miVersions="mi,mi1,mi2"
+            name="%StandardCommandFactory.name"
+            platforms="*"/>
    </extension>
 
 </plugin>