diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index c64fc02bf85..69eb37e633d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-10 Mikhail Khodjaiants
+	"set solib-search-path" and "show solib-search-path" are not supported on Windows.
+	* StandardWinCommandFactory.java
+
 2006-04-03 Mikhail Khodjaiants
 	Bug 134617: The "stop on shared library event" option doesn't work.
 	* GDBCDIDebugger2.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java
index ed8cf4661fc..5adf07ae816 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java
@@ -13,6 +13,8 @@ package org.eclipse.cdt.debug.mi.core.command.factories.win32;
 import org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary;
 import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentCD;
 import org.eclipse.cdt.debug.mi.core.command.MIGDBSetAutoSolib;
+import org.eclipse.cdt.debug.mi.core.command.MIGDBSetSolibSearchPath;
+import org.eclipse.cdt.debug.mi.core.command.MIGDBShowSolibSearchPath;
 import org.eclipse.cdt.debug.mi.core.command.factories.StandardCommandFactory;
  
 /**
@@ -77,4 +79,64 @@ public class StandardWinCommandFactory extends StandardCommandFactory {
 			}			
 		};
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createMIGDBShowSolibSearchPath()
+	 */
+	public MIGDBShowSolibSearchPath createMIGDBShowSolibSearchPath() {
+		// Suppress "show solib-search-path" - returns error on Windows
+		return new MIGDBShowSolibSearchPath( getMIVersion() ) {
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOperation()
+			 */
+			public String getOperation() {
+				return ""; //$NON-NLS-1$
+			}
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOptions()
+			 */
+			public String[] getOptions() {
+				return new String[0];
+			}
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getParameters()
+			 */
+			public String[] getParameters() {
+				return new String[0];
+			}			
+		};
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createMIGDBSetSolibSearchPath(java.lang.String[])
+	 */
+	public MIGDBSetSolibSearchPath createMIGDBSetSolibSearchPath( String[] params ) {
+		// Suppress "set solib-search-path" - returns error on Windows
+		return new MIGDBSetSolibSearchPath( getMIVersion(), params ) {
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOperation()
+			 */
+			public String getOperation() {
+				return ""; //$NON-NLS-1$
+			}
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOptions()
+			 */
+			public String[] getOptions() {
+				return new String[0];
+			}
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getParameters()
+			 */
+			public String[] getParameters() {
+				return new String[0];
+			}			
+		};
+	}
 }