diff --git a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java
index e71395e30ae..cfb603bb42a 100644
--- a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java
+++ b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java
@@ -398,14 +398,14 @@ public class FinalLaunchSequence extends Sequence {
                     
                         fCommandControl.queueCommand(
                         		new MITargetSelect(fCommandControl.getContext(), 
-                        				           fRemoteTcpHost, fRemoteTcpPort), 
+                        				           fRemoteTcpHost, fRemoteTcpPort, fAttach), 
                         	    new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
                		} else {
                			if (!getSerialDevice(requestMonitor)) return;
                     
                         fCommandControl.queueCommand(
                         		new MITargetSelect(fCommandControl.getContext(), 
-                        				           fSerialDevice), 
+                        				           fSerialDevice, fAttach), 
                         	    new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
                		}
             	} else {
@@ -489,7 +489,7 @@ public class FinalLaunchSequence extends Sequence {
     DsfServicesTracker fTracker;
         
     public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, SessionType sessionType, boolean attach, IProgressMonitor pm) {
-        super(executor, pm, "Configuring GDB", "Aborting configuring GDB");  
+        super(executor, pm, "Configuring GDB", "Aborting configuring GDB");    //$NON-NLS-1$//$NON-NLS-2$
         fLaunch = launch;
         fSessionType = sessionType;
         fAttach = attach;
diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetSelect.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetSelect.java
index 2d55e7bc333..88a5fbc8dc5 100644
--- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetSelect.java
+++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetSelect.java
@@ -18,12 +18,28 @@ import org.eclipse.dd.mi.service.command.output.MIInfo;
  */
 public class MITargetSelect extends MICommand<MIInfo> {
 
+	@Deprecated
 	public MITargetSelect(IDMContext ctx, String host, String port) {
-		super(ctx, "-target-select extended-remote", new String[] {host + ":" + port}); //$NON-NLS-1$ //$NON-NLS-2$
+		this(ctx, host, port, true);
 	}
 	
+	@Deprecated	
 	public MITargetSelect(IDMContext ctx, String serialDevice) {
-		super(ctx, "-target-select extended-remote", new String[] {serialDevice}); //$NON-NLS-1$
+		this(ctx, serialDevice, true);
+	}
+
+	/**
+	 * @since 1.1
+	 */
+	public MITargetSelect(IDMContext ctx, String host, String port, boolean extended) {
+		super(ctx, "-target-select", new String[] { extended ? "extended-remote" : "remote", host + ":" + port}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	}
+	
+	/**
+	 * @since 1.1
+	 */
+	public MITargetSelect(IDMContext ctx, String serialDevice, boolean extended) {
+		super(ctx, "-target-select", new String[] { extended ? "extended-remote" : "remote", serialDevice}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 
 }