diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MISession.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MISession.java
index 0c0ef8cb387..5471d2c0f25 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MISession.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MISession.java
@@ -245,7 +245,7 @@ MIPlugin.getDefault().debugLog(number++ + " " + cmd.toString());
 			postCommand(exit);
 		} catch (MIException e) {
 		}
-
+		
 		// Close the input GDB prompt
 		try {
 			if (inChannel != null)
@@ -298,6 +298,12 @@ MIPlugin.getDefault().debugLog(number++ + " " + cmd.toString());
 			}
 		} catch (IOException e) {
 		}
+		
+		// Make sure it gdb is killed.
+		// FIX: Spawner will do the waitFor();
+		if (miProcess != null) {
+			miProcess.destroy();
+		}
 	}
 
 	/**