diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
index dbd6dc9cac3..67d50b65495 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
@@ -263,7 +263,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
                     return false;
                 }
             }, 
-            2, TimeUnit.SECONDS);
+            getGDBExitWaitTime(), TimeUnit.SECONDS);
         
         queueCommand(
        		getCommandFactory().createMIGDBExit(fControlDmc),
@@ -660,4 +660,13 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
 	protected boolean isInitialized() {
 		return fInitialized;
 	}
+
+	/**
+	 * Returns the time (in seconds) the debugger will wait for "gdb-exit" to complete.
+	 * 
+	 * @since 4.2
+	 */
+	protected int getGDBExitWaitTime() {
+		return 2;
+	}
 }