diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
index 0765959e5c6..e3ebb3e5169 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
@@ -108,7 +108,7 @@ public class SourceManager extends SessionObject implements ICDISourceManager {
 	public void setAutoSolib() throws CDIException {
 		MISession mi = getCSession().getMISession();
 		CommandFactory factory = mi.getCommandFactory();
-		MIGDBSetAutoSolib solib = factory.createMIGDBSetAutoSolib();
+		MIGDBSetAutoSolib solib = factory.createMIGDBSetAutoSolib(true);
 		try {
 			mi.postCommand(solib);
 			MIInfo info = solib.getMIInfo();
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java
index 5159e53cacf..824bd5faad1 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java
@@ -163,8 +163,8 @@ public class CommandFactory {
 		return new MIGDBSet(params);
 	}
 
-	public MIGDBSetAutoSolib createMIGDBSetAutoSolib() {
-		return new MIGDBSetAutoSolib();
+	public MIGDBSetAutoSolib createMIGDBSetAutoSolib(boolean set) {
+		return new MIGDBSetAutoSolib(set);
 	}
 
 	public MIGDBSetSolibSearchPath createMIGDBSetSolibSearchPath(String[] params) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIGDBSetAutoSolib.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIGDBSetAutoSolib.java
index bb141702fbd..4868c0fa094 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIGDBSetAutoSolib.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIGDBSetAutoSolib.java
@@ -14,7 +14,7 @@ package org.eclipse.cdt.debug.mi.core.command;
  * 
  */
 public class MIGDBSetAutoSolib extends MIGDBSet {
-	public MIGDBSetAutoSolib() {
-		super(new String[] {"auto-solib-add"});
+	public MIGDBSetAutoSolib(boolean isSet) {
+		super(new String[] {"auto-solib-add", (isSet) ? "1" : "0"});
 	}
 }