diff --git a/plugins/org.eclipse.dd.gdb.launch/plugin.xml b/plugins/org.eclipse.dd.gdb.launch/plugin.xml
index 4b4a09485e8..cc2a0d580d0 100644
--- a/plugins/org.eclipse.dd.gdb.launch/plugin.xml
+++ b/plugins/org.eclipse.dd.gdb.launch/plugin.xml
@@ -12,7 +12,7 @@
             modes="debug">
       </launchConfigurationType>
       <launchConfigurationType
-            delegate="org.eclipse.dd.gdb.launch.launching.GdbLocalLaunchDelegate"
+            delegate="org.eclipse.dd.gdb.launch.launching.GdbRemoteLaunchDelegate"
             id="org.eclipse.dd.gdb.launch.remoteCLaunch"
             modes="debug"
             name="Remote C/C++ Application  (Experimental - DSF)"
diff --git a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbRemoteLaunchDelegate.java b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbRemoteLaunchDelegate.java
index 77f554e2b57..5063de3a099 100644
--- a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbRemoteLaunchDelegate.java
+++ b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbRemoteLaunchDelegate.java
@@ -79,15 +79,6 @@ implements ILaunchConfigurationDelegate2
 			return;
 		}
 		try {
-			// Hack until we fix the tabs
-			try {
-				ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-				wc.setAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE );
-				wc.doSave();
-			}
-			catch( CoreException e ) {
-			}
-			// END HACK
 			String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE );
 			if ( debugMode.equals( IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE ) ) {
 				launchRemoteDebugSession( config, launch, monitor );
diff --git a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/LaunchSequence.java b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/LaunchSequence.java
index 624517fad07..6a7676d65a1 100644
--- a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/LaunchSequence.java
+++ b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/LaunchSequence.java
@@ -13,6 +13,7 @@ package org.eclipse.dd.gdb.launch.launching;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
+import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants;
 import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -29,6 +30,7 @@ import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.gdb.launch.internal.GdbLaunchPlugin;
 import org.eclipse.dd.gdb.service.GDBRunControl;
 import org.eclipse.dd.gdb.service.command.GDBControl;
+import org.eclipse.dd.gdb.service.command.GDBControl.SessionType;
 import org.eclipse.dd.mi.service.CSourceLookup;
 import org.eclipse.dd.mi.service.ExpressionService;
 import org.eclipse.dd.mi.service.MIBreakpoints;
@@ -39,7 +41,10 @@ import org.eclipse.dd.mi.service.MIModules;
 import org.eclipse.dd.mi.service.MIRegisters;
 import org.eclipse.dd.mi.service.MIStack;
 import org.eclipse.dd.mi.service.command.commands.MIBreakInsert;
+import org.eclipse.dd.mi.service.command.commands.MICommand;
+import org.eclipse.dd.mi.service.command.commands.MIExecContinue;
 import org.eclipse.dd.mi.service.command.commands.MIExecRun;
+import org.eclipse.dd.mi.service.command.commands.MITargetSelect;
 import org.eclipse.dd.mi.service.command.output.MIBreakInsertInfo;
 import org.eclipse.dd.mi.service.command.output.MIInfo;
 import org.eclipse.debug.core.DebugException;
@@ -51,28 +56,46 @@ public class LaunchSequence extends Sequence {
         new Step() { 
             @Override
             public void execute(RequestMonitor requestMonitor) {
+            	String debugMode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN;
+            	try {
+            		debugMode = fLaunch.getLaunchConfiguration().getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
+            				                                                  ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN );
+            	} catch (CoreException e) {
+            	}
+
+            	if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
+            		fSessionType = SessionType.RUN;
+            	} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
+            		fSessionType = SessionType.ATTACH;
+            	} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE)) {
+            		fSessionType = SessionType.CORE;
+            	} else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) {
+            		fSessionType = SessionType.REMOTE;
+            	} else {
+                	fSessionType = SessionType.RUN;
+            	}
+
                 //
                 // Create the connection.
                 //
-                fCommandControl = new GDBControl(
-                    fSession, getGDBPath(), fExecPath, GDBControl.SessionType.RUN, 30);
+                fCommandControl = new GDBControl(fSession, getGDBPath(), fExecPath, fSessionType, 30);
                 fCommandControl.initialize(requestMonitor);
             }
         },
         new Step() { @Override
         public void execute(RequestMonitor requestMonitor) {
-            new GDBRunControl(fSession).initialize(requestMonitor);
+        	new GDBRunControl(fSession).initialize(requestMonitor);
         }},
         new Step() { @Override
         public void execute(RequestMonitor requestMonitor) {
             new StepQueueManager(fSession).initialize(requestMonitor);
         }},
         new Step() { @Override
-            public void execute(RequestMonitor requestMonitor) {
+        public void execute(RequestMonitor requestMonitor) {
                 new MIMemory(fSession).initialize(requestMonitor);
         }},
         new Step() { @Override
-            public void execute(RequestMonitor requestMonitor) {
+        public void execute(RequestMonitor requestMonitor) {
                 new MIModules(fSession).initialize(requestMonitor);
         }},
         new Step() { @Override
@@ -99,33 +122,111 @@ public class LaunchSequence extends Sequence {
         public void execute(final RequestMonitor requestMonitor) {
             // Create the low-level breakpoint service 
             final MIBreakpoints bpService = new MIBreakpoints(fSession);
-            bpService.initialize(new RequestMonitor(getExecutor(), requestMonitor) {
-                @Override
-                protected void handleOK() {
-                	requestMonitor.done();
-                }
-            }); 
+            bpService.initialize(new RequestMonitor(getExecutor(), requestMonitor));
         }},
         new Step() { @Override
-            public void execute(final RequestMonitor requestMonitor) {
-                // Create high-level breakpoint service and install breakpoints 
-                // for the GDB debug context.
-                final MIBreakpointsManager bpmService = new MIBreakpointsManager(fSession, CDebugCorePlugin.PLUGIN_ID);
-                bpmService.initialize(new RequestMonitor(getExecutor(), requestMonitor) {
-                    @Override
-                    protected void handleOK() {
-                        bpmService.startTrackingBreakpoints(fCommandControl.getGDBDMContext(), requestMonitor);
-                    }
-                }); 
-            }},
+        public void execute(final RequestMonitor requestMonitor) {
+            // Create high-level breakpoint service and install breakpoints 
+            // for the GDB debug context.
+            fBpmService = new MIBreakpointsManager(fSession, CDebugCorePlugin.PLUGIN_ID);
+            fBpmService.initialize(new RequestMonitor(getExecutor(), requestMonitor)); 
+        }},
         new Step() { @Override
         public void execute(RequestMonitor requestMonitor) {
             new MIRegisters(fSession).initialize(requestMonitor);
         }},
         new Step() { @Override
-            public void execute(RequestMonitor requestMonitor) {
-                new MIDisassembly(fSession).initialize(requestMonitor);
-            }},
+        public void execute(RequestMonitor requestMonitor) {
+            new MIDisassembly(fSession).initialize(requestMonitor);
+        }},
+        /* If remote debugging, connect to target */
+        new Step() {
+        	private boolean fTcpConnection;
+            private String fRemoteTcpHost;
+            private String fRemoteTcpPort;
+            private String fSerialDevice;
+            
+            private boolean checkConnectionType(RequestMonitor requestMonitor) {
+                try {
+                	fTcpConnection = fLaunch.getLaunchConfiguration().getAttribute(
+                                    IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP,
+                                    false);
+                } catch (CoreException e) {
+                    requestMonitor.setStatus(new Status(IStatus.ERROR, GdbLaunchPlugin.PLUGIN_ID, -1, "Cannot retrieve connection mode", e)); //$NON-NLS-1$
+                    requestMonitor.done();
+                    return false;
+                }
+                return true;
+            }
+            
+            private boolean getSerialDevice(RequestMonitor requestMonitor) {
+                try {
+                    fSerialDevice = fLaunch.getLaunchConfiguration().getAttribute(
+                                    			IGDBServerMILaunchConfigurationConstants.ATTR_DEV, "invalid");
+                } catch (CoreException e) {
+                    requestMonitor.setStatus(new Status(IStatus.ERROR, GdbLaunchPlugin.PLUGIN_ID, -1, "Cannot retrieve serial device", e)); //$NON-NLS-1$
+                    requestMonitor.done();
+                    return false;
+                }
+                return true;
+            }
+            
+            private boolean getTcpHost(RequestMonitor requestMonitor) {
+                try {
+                    fRemoteTcpHost = fLaunch.getLaunchConfiguration().getAttribute(
+                    							IGDBServerMILaunchConfigurationConstants.ATTR_HOST, "invalid");
+                } catch (CoreException e) {
+                    requestMonitor.setStatus(new Status(IStatus.ERROR, GdbLaunchPlugin.PLUGIN_ID, -1, "Cannot retrieve remote TCP host", e)); //$NON-NLS-1$
+                    requestMonitor.done();
+                    return false;
+                }
+                return true;
+            }
+
+            private boolean getTcpPort(RequestMonitor requestMonitor) {
+                try {
+                    fRemoteTcpPort = fLaunch.getLaunchConfiguration().getAttribute(
+                                    			IGDBServerMILaunchConfigurationConstants.ATTR_PORT, "invalid");
+                } catch (CoreException e) {
+                    requestMonitor.setStatus(new Status(IStatus.ERROR, GdbLaunchPlugin.PLUGIN_ID, -1, "Cannot retrieve remote TCP port", e)); //$NON-NLS-1$
+                    requestMonitor.done();
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            public void execute(final RequestMonitor requestMonitor) {
+               	if (fSessionType == SessionType.REMOTE) {
+               		if (!checkConnectionType(requestMonitor)) return;
+               		
+               		if (fTcpConnection) {
+                   		if (!getTcpHost(requestMonitor)) return;
+                        if (!getTcpPort(requestMonitor)) return;
+                    
+                        fCommandControl.queueCommand(
+                        		new MITargetSelect((IContainerDMContext)fCommandControl.getControlDMContext(), 
+                        				            fRemoteTcpHost, fRemoteTcpPort), 
+                        	    new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
+               		} else {
+               			if (!getSerialDevice(requestMonitor)) return;
+                    
+                        fCommandControl.queueCommand(
+                        		new MITargetSelect((IContainerDMContext)fCommandControl.getControlDMContext(), 
+                        				           fSerialDevice), 
+                        	    new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
+               		}
+            	} else {
+            		requestMonitor.done();
+            	}
+ 
+            }
+        },
+        /* Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging) */
+        new Step() { @Override
+        public void execute(final RequestMonitor requestMonitor) {
+        	fBpmService.startTrackingBreakpoints(fCommandControl.getGDBDMContext(), requestMonitor);
+        }},
         /*
          * If needed, insert breakpoint at main and run to it.
          */
@@ -161,18 +262,18 @@ public class LaunchSequence extends Sequence {
             
             @Override
             public void execute(final RequestMonitor requestMonitor) {
+            	final MICommand<MIInfo> execCommand;
+            	if (fSessionType == SessionType.REMOTE) {
+            		// When doing remote debugging, we use -exec-continue instead of -exec-run 
+            	    execCommand = new MIExecContinue((IContainerDMContext)fCommandControl.getControlDMContext());
+            	} else {
+            		execCommand = new MIExecRun((IContainerDMContext)fCommandControl.getControlDMContext(), new String[0]);	
+            	}
+            	
                 if (!readStopAtMain(requestMonitor)) return;
                 if (!fStopInMain) {
                 	// Just start the program.
-    				fCommandControl.queueCommand(
-    						new MIExecRun((IContainerDMContext)fCommandControl.getControlDMContext(), new String[0]), 
-    						new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor) {
-    							@Override
-    							protected void handleOK() {
-    								requestMonitor.done();
-    							}
-    						}
-    				);
+    				fCommandControl.queueCommand(execCommand, new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
                 } else {
                     if (!readStopSymbol(requestMonitor)) return;
                 
@@ -185,16 +286,8 @@ public class LaunchSequence extends Sequence {
                     			@Override
                     			protected void handleOK() {
 
-                    				// After the break-insert is done, execute the -exec-run command.
-                    				fCommandControl.queueCommand(
-                    						new MIExecRun((IContainerDMContext)fCommandControl.getControlDMContext(), new String[0]), 
-                    						new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor) {
-                    							@Override
-                    							protected void handleOK() {
-                                    				requestMonitor.done();
-                    							}
-                    						}
-                    				);
+                    				// After the break-insert is done, execute the -exec-run or -exec-continue command.
+                    				fCommandControl.queueCommand(execCommand, new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
                     			}
                     		});
                 }
@@ -205,9 +298,11 @@ public class LaunchSequence extends Sequence {
     DsfSession fSession;
     GdbLaunch fLaunch;
     IPath fExecPath;
+    SessionType fSessionType;
 
     GDBControl fCommandControl;
     CSourceLookup fSourceLookup;
+    MIBreakpointsManager fBpmService;
 
     public LaunchSequence(DsfSession session, GdbLaunch launch, IPath execPath) {
         super(session.getExecutor());
diff --git a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/service/command/GDBControl.java b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/service/command/GDBControl.java
index ea79486a158..0e33727fc38 100644
--- a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/service/command/GDBControl.java
+++ b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/service/command/GDBControl.java
@@ -86,7 +86,7 @@ public class GDBControl extends AbstractMIControl {
     private static int fgInstanceCounter = 0;
     private final GDBControlDMContext fControlDmc;
 
-    public enum SessionType { RUN, ATTACH, CORE }
+    public enum SessionType { RUN, ATTACH, CORE, REMOTE }
     private SessionType fSessionType;
     
     private boolean fConnected = false;
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 80b5bc84c37..e0071c19626 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
@@ -14,11 +14,16 @@ import org.eclipse.dd.dsf.datamodel.IDMContext;
 import org.eclipse.dd.mi.service.command.output.MIInfo;
 
 /**
- * This command connects to a remote target using TCP/IP.
+ * This command connects to a remote target.
  */
 public class MITargetSelect extends MICommand<MIInfo> {
 
 	public MITargetSelect(IDMContext ctx, String host, String port) {
 		super(ctx, "-target-select extended-remote " + host + ":" + port); //$NON-NLS-1$ //$NON-NLS-2$
 	}
+	
+	public MITargetSelect(IDMContext ctx, String serialDevice) {
+		super(ctx, "-target-select extended-remote " + serialDevice); //$NON-NLS-1$
+	}
+
 }